commit b5bc6ca03caf0f6ce2d8e58de02453c7a255bb83
author Valentin Valchev <vvalchev@apache.org> Wed Jul 16 09:09:38 2014 +0000
committer Valentin Valchev <vvalchev@apache.org> Wed Jul 16 09:09:38 2014 +0000
tree c0dc59aa7020c443223385e599169299f38bed96
parent c1d953cf58a31bc17c8349ee377507cdb957b3c5

Fixed FELIX-4562 : Web Console License plugin fails to load files
https://issues.apache.org/jira/browse/FELIX-4562

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1610945 13f79535-47bb-0310-9956-ffa450edef68

webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/LicenseServlet.java

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 1e2bd07..7128b4e 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
@@ -277,7 +277,13 @@
 
         if ( pathInfo.innerJar == null )
         {
-            final URL resource = bundle.getResource( pathInfo.licenseFile );
+            URL resource = bundle.getEntry( pathInfo.licenseFile );
+            if ( resource == null)
+            {
+                resource = bundle.getResource( pathInfo.licenseFile );
+            }
+        
+            
             if ( resource != null )
             {
                 final InputStream input = resource.openStream();