FELIX-2708 Prevent NPE in LicenseServlet
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1220409 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/LicenseServlet.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/LicenseServlet.java
index e9f1aca..b2cd890 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/LicenseServlet.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/LicenseServlet.java
@@ -295,30 +295,32 @@
}
}
}
-
- // license is in a nested JAR
- final URL zipResource = bundle.getResource( pathInfo.innerJar );
- if ( zipResource != null )
+ else
{
- final InputStream input = zipResource.openStream();
- ZipInputStream zin = null;
- try
+ // license is in a nested JAR
+ final URL zipResource = bundle.getResource( pathInfo.innerJar );
+ if ( zipResource != null )
{
- zin = new ZipInputStream( input );
- for ( ZipEntry zentry = zin.getNextEntry(); zentry != null; zentry = zin.getNextEntry() )
+ final InputStream input = zipResource.openStream();
+ ZipInputStream zin = null;
+ try
{
- if ( pathInfo.licenseFile.equals( zentry.getName() ) )
+ zin = new ZipInputStream( input );
+ for ( ZipEntry zentry = zin.getNextEntry(); zentry != null; zentry = zin.getNextEntry() )
{
- IOUtils.copy( zin, response.getWriter() );
- return true;
+ if ( pathInfo.licenseFile.equals( zentry.getName() ) )
+ {
+ IOUtils.copy( zin, response.getWriter() );
+ return true;
+ }
}
}
- }
- finally
- {
+ finally
+ {
- IOUtils.closeQuietly( zin );
- IOUtils.closeQuietly( input );
+ IOUtils.closeQuietly( zin );
+ IOUtils.closeQuietly( input );
+ }
}
}