You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2010/10/04 22:14:05 UTC

svn commit: r1004388 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java

Author: rickhall
Date: Mon Oct  4 20:14:05 2010
New Revision: 1004388

URL: http://svn.apache.org/viewvc?rev=1004388&view=rev
Log:
Unlike ClassLoader.getResources(), Bundle.getResources() should return null.
(FELIX-2629)

Modified:
    felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java?rev=1004388&r1=1004387&r2=1004388&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java Mon Oct  4 20:14:05 2010
@@ -623,7 +623,10 @@ class BundleImpl implements Bundle
             }
         }
 
-        return getFramework().getBundleResources(this, name);
+        // Spec says we should return null when resources not found,
+        // even though ClassLoader.getResources() returns empty enumeration.
+        Enumeration e = getFramework().getBundleResources(this, name);
+        return ((e == null) || !e.hasMoreElements()) ? null : e;
     }
 
     /**