Generate a gateway bundle that aggregate split META-INF/services resources

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@799510 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 1 deletions

diff --git a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
index d54eac2228..fc1f4bd6c6 100644
--- a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
+++ b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
@@ -60,7 +60,8 @@ public class ClassLoaderModelResolver extends URLClassLoader implements ModelRes
             }
         }
         if (parentClassLoader == null) {
-            parentClassLoader = ServiceDiscovery.getInstance().getServiceDiscoverer().getClass().getClassLoader();
+            // The extensibility bundle has DynamicImport-Package = *
+            parentClassLoader = ServiceDiscovery.class.getClassLoader();
         }
 
         return parentClassLoader;