FELIX-2645: Introduce the org.apache.felix.jarurls property
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1021270 13f79535-47bb-0310-9956-ffa450edef68
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 c28f3fa..e3b8774 100644
--- a/framework/src/main/java/org/apache/felix/framework/ModuleImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/ModuleImpl.java
@@ -1712,7 +1712,16 @@
public Enumeration getResources(String name)
{
- return ModuleImpl.this.getResourcesByDelegation(name);
+ boolean jarUrl = m_jarUrl.get();
+ try
+ {
+ m_jarUrl.set(true);
+ return ModuleImpl.this.getResourcesByDelegation(name);
+ }
+ finally
+ {
+ m_jarUrl.set(jarUrl);
+ }
}
protected Enumeration findResources(String name)
@@ -2013,7 +2022,16 @@
public URL getResource(String name)
{
- return ModuleImpl.this.getResourceByDelegation(name);
+ boolean jarUrl = m_jarUrl.get();
+ try
+ {
+ m_jarUrl.set(true);
+ return ModuleImpl.this.getResourceByDelegation(name);
+ }
+ finally
+ {
+ m_jarUrl.set(jarUrl);
+ }
}
protected URL findResource(String name)
@@ -2028,7 +2046,16 @@
// can't. As a workaround, we make findResources() delegate instead.
protected Enumeration findResources(String name)
{
- return getResourcesByDelegation(name);
+ boolean jarUrl = m_jarUrl.get();
+ try
+ {
+ m_jarUrl.set(true);
+ return getResourcesByDelegation(name);
+ }
+ finally
+ {
+ m_jarUrl.set(jarUrl);
+ }
}
protected String findLibrary(String name)