svn commit: r1221453 - /tuscany/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java

[antelder]

Author: antelder
Date: Tue Dec 20 19:30:45 2011
New Revision: 1221453

URL: http://svn.apache.org/viewvc?rev=1221453&view=rev
Log:
TUSCANY-3998: Apply revised patch from Greg Dritschler to provide a way to 
override Tuscany system definition.xml documents

Modified:
    
tuscany/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java?rev=1221453&r1=1221452&r2=1221453&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
 Tue Dec 20 19:30:45 2011
@@ -172,7 +172,12 @@ public class EquinoxServiceDiscoverer im
         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;
                 }
             });
         }