svn commit: r899196 - /tuscany/sca-java-2.x/trunk/modules/sca-api/src/main/java/org/oasisopen/sca/client/impl/SCAClientFactoryFinder.java

[slaws]

Author: slaws
Date: Thu Jan 14 13:40:44 2010
New Revision: 899196

URL: http://svn.apache.org/viewvc?rev=899196&view=rev
Log:
TUSCANY-3424 flip round the order in which the classloaders are set in the 
finder. Temporary change while fixing up the SCAClientFactory selection 
mechanism

Modified:
    
tuscany/sca-java-2.x/trunk/modules/sca-api/src/main/java/org/oasisopen/sca/client/impl/SCAClientFactoryFinder.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/sca-api/src/main/java/org/oasisopen/sca/client/impl/SCAClientFactoryFinder.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/sca-api/src/main/java/org/oasisopen/sca/client/impl/SCAClientFactoryFinder.java?rev=899196&r1=899195&r2=899196&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/sca-api/src/main/java/org/oasisopen/sca/client/impl/SCAClientFactoryFinder.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/sca-api/src/main/java/org/oasisopen/sca/client/impl/SCAClientFactoryFinder.java
 Thu Jan 14 13:40:44 2010
@@ -57,10 +57,15 @@
      *                 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);