commit 17a484ab52f0a74957cd78fa0960bd27e4a00a26
author Richard S. Hall <rickhall@apache.org> Mon Aug 31 14:58:14 2009 +0000
committer Richard S. Hall <rickhall@apache.org> Mon Aug 31 14:58:14 2009 +0000
tree c6565b71aec3768d42f698d530d251a6c51961fe
parent cb46b9e5f384015fe1928963ea645526d43cec3c

For resource loading we won't always have a class loader, so we
need to check for that case. (FELIX-1193)


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@809619 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 581cdb6..61d3cf0 100644
--- a/framework/src/main/java/org/apache/felix/framework/ModuleImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/ModuleImpl.java
@@ -820,7 +820,8 @@
             try
             {
                 // Get the appropriate class loader for delegation.
-                ClassLoader parent = m_classLoader.getParent();
+                ClassLoader parent = (m_classLoader == null)
+                    ? determineParentClassLoader() : m_classLoader.getParent();
                 parent = (parent == null) ? m_bootClassLoader : parent;
                 urls = parent.getResources(name);
             }