felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vvalc...@apache.org
Subject svn commit: r1610945 - /felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/LicenseServlet.java
Date Wed, 16 Jul 2014 09:09:38 GMT
Author: vvalchev
Date: Wed Jul 16 09:09:38 2014
New Revision: 1610945

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

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

Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/LicenseServlet.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/LicenseServlet.java?rev=1610945&r1=1610944&r2=1610945&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/LicenseServlet.java
(original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/LicenseServlet.java
Wed Jul 16 09:09:38 2014
@@ -277,7 +277,13 @@ public final class LicenseServlet extend
 
         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();



Mime
View raw message