You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@felix.apache.org by pa...@apache.org on 2011/09/12 12:15:30 UTC

svn commit: r1169677 - /felix/trunk/framework.security/src/main/java/org/apache/felix/framework/security/util/BundleInputStream.java

Author: pauls
Date: Mon Sep 12 10:15:30 2011
New Revision: 1169677

URL: http://svn.apache.org/viewvc?rev=1169677&view=rev
Log:
Allow for directories in getEntries of bundles - this should allow for exploded bundles to work (FELIX-3004).

Modified:
    felix/trunk/framework.security/src/main/java/org/apache/felix/framework/security/util/BundleInputStream.java

Modified: felix/trunk/framework.security/src/main/java/org/apache/felix/framework/security/util/BundleInputStream.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework.security/src/main/java/org/apache/felix/framework/security/util/BundleInputStream.java?rev=1169677&r1=1169676&r2=1169677&view=diff
==============================================================================
--- felix/trunk/framework.security/src/main/java/org/apache/felix/framework/security/util/BundleInputStream.java (original)
+++ felix/trunk/framework.security/src/main/java/org/apache/felix/framework/security/util/BundleInputStream.java Mon Sep 12 10:15:30 2011
@@ -57,7 +57,11 @@ public final class BundleInputStream ext
         for (Enumeration e = m_root.getEntries(); e.hasMoreElements();)
         {
             String entry = (String) e.nextElement();
-            if (entry.equalsIgnoreCase("META-INF/MANIFEST.MF"))
+            if (entry.endsWith("/")) 
+            {
+                // ignore
+            } 
+            else if (entry.equalsIgnoreCase("META-INF/MANIFEST.MF"))
             {
                 if (manifest == null)
                 {