1 files changed, 7 insertions, 2 deletions
diff --git a/sca-java-2.x/trunk/modules/sca-api/src/main/java/org/oasisopen/sca/client/impl/SCAClientFactoryFinder.java b/sca-java-2.x/trunk/modules/sca-api/src/main/java/org/oasisopen/sca/client/impl/SCAClientFactoryFinder.java
index c02494d48b..4bbb769142 100644
--- a/sca-java-2.x/trunk/modules/sca-api/src/main/java/org/oasisopen/sca/client/impl/SCAClientFactoryFinder.java
+++ b/sca-java-2.x/trunk/modules/sca-api/src/main/java/org/oasisopen/sca/client/impl/SCAClientFactoryFinder.java
@@ -57,10 +57,15 @@ public class SCAClientFactoryFinder {
      *                 implementation.
      */
     public static SCAClientFactory find(Properties properties, ClassLoader classLoader, URI domainURI) {
+        // TODO - TUSCANY-3424 - swap the order here temporarily to help with the 
+        //                       fixes to the client factory lookup processing
+        //                       will revert when TUSCANY-3424 is done
         if (classLoader == null) {
-            classLoader = getThreadContextClassLoader();
+            // classLoader = getThreadContextClassLoader();
+            classLoader = SCAClientFactoryFinder.class.getClassLoader();
             if (classLoader == null) {
-                classLoader = SCAClientFactoryFinder.class.getClassLoader();
+                //classLoader = SCAClientFactoryFinder.class.getClassLoader();
+                classLoader = getThreadContextClassLoader();
             }
         }
         final String factoryImplClassName = discoverProviderFactoryImplClass(properties, classLoader);