summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules/extensibility-equinox/src
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-12-20 19:30:45 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-12-20 19:30:45 +0000
commit87e69e61ada2e05e58519225ceb984510b3cd1a7 (patch)
treebbdfab0b32f26ad5cbc28f0907608ccaa877d0a5 /sca-java-2.x/trunk/modules/extensibility-equinox/src
parent4aa17b270b52f3801cee236cfa03ab392cde813d (diff)
TUSCANY-3998: Apply revised patch from Greg Dritschler to provide a way to override Tuscany system definition.xml documents
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1221453 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/extensibility-equinox/src')
-rw-r--r--sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java b/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
index 370565e09c..9e9270e461 100644
--- a/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
+++ b/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
@@ -172,7 +172,12 @@ public class EquinoxServiceDiscoverer implements ServiceDiscoverer {
public URL getResource(final String name) {
return AccessController.doPrivileged(new PrivilegedAction<URL>() {
public URL run() {
- return bundle.getResource(name);
+ // Search bundle first using getEntry()
+ URL url = bundle.getEntry(name);
+ // If not found in bundle, try getResource() which looks at imports
+ if (url == null)
+ url = bundle.getResource(name);
+ return url;
}
});
}