commit 3b7ae204ee84d6d7186d9097d19621fe673974c0
author Richard S. Hall <rickhall@apache.org> Sun Sep 26 21:22:36 2010 +0000
committer Richard S. Hall <rickhall@apache.org> Sun Sep 26 21:22:36 2010 +0000
tree 1bcc1ed2c60ab70c44910597e57006562f44d1a1
parent c95daf0618282b57719d3b9001e42cddb9ec4cf7

Module class loader should return empty enumeration for getResources(). (FELIX-2629)


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

framework/src/main/java/org/apache/felix/framework/ModuleImpl.java

diff --git a/framework/src/main/java/org/apache/felix/framework/ModuleImpl.java b/framework/src/main/java/org/apache/felix/framework/ModuleImpl.java
index 18ecd24..230b213 100644
--- a/framework/src/main/java/org/apache/felix/framework/ModuleImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/ModuleImpl.java
@@ -835,8 +835,7 @@
             requestSet.add(name);
             try
             {
-                Enumeration urls = findResourcesByDelegation(name);
-                return (urls.hasMoreElements()) ? urls : null;
+                return findResourcesByDelegation(name);
             }
             finally
             {

framework/src/main/java/org/apache/felix/framework/resolver/WireImpl.java

diff --git a/framework/src/main/java/org/apache/felix/framework/resolver/WireImpl.java b/framework/src/main/java/org/apache/felix/framework/resolver/WireImpl.java
index 5ca3a20..96d675c 100755
--- a/framework/src/main/java/org/apache/felix/framework/resolver/WireImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/resolver/WireImpl.java
@@ -163,7 +163,7 @@
             // If no resource was found, then we must throw an exception
             // since the exporter for this package did not contain the
             // requested class.
-            if (urls == null)
+            if (!urls.hasMoreElements())
             {
                 throw new ResourceNotFoundException(name);
             }

framework/src/main/java/org/apache/felix/framework/resolver/WireModuleImpl.java

diff --git a/framework/src/main/java/org/apache/felix/framework/resolver/WireModuleImpl.java b/framework/src/main/java/org/apache/felix/framework/resolver/WireModuleImpl.java
index 17277bb..734ee46 100644
--- a/framework/src/main/java/org/apache/felix/framework/resolver/WireModuleImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/resolver/WireModuleImpl.java
@@ -145,7 +145,7 @@
         if (m_packages.contains(pkgName))
         {
             Enumeration urls = m_exporter.getResourcesByDelegation(name);
-            if (urls != null)
+            if (urls.hasMoreElements())
             {
                 return urls;
             }