1 files changed, 4 insertions, 1 deletions
diff --git a/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientModuleActivator.java b/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientModuleActivator.java
index 0cf41e071c..d2fdbc302d 100644
--- a/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientModuleActivator.java
+++ b/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientModuleActivator.java
@@ -24,7 +24,10 @@ import org.apache.tuscany.sca.core.ModuleActivator;
 public class SCAClientModuleActivator implements ModuleActivator {
     
     public void start() { 
-        SCAClientFactoryImpl.setSCAClientFactoryFinder(new SCAClientFactoryFinderImpl());
+        // Do not replace the finder if it's already been set by some other means
+        if (SCAClientFactoryImpl.getSCAClientFactoryFinder() == null) {
+            SCAClientFactoryImpl.setSCAClientFactoryFinder(new SCAClientFactoryFinderImpl());
+        }
     }
 
     public void stop() {