From c66b8a374705b3f305d835e11ae18641f31d3dc0 Mon Sep 17 00:00:00 2001 From: slaws Date: Thu, 14 Jan 2010 13:40:44 +0000 Subject: TUSCANY-3424 flip round the order in which the classloaders are set in the finder. Temporary change while fixing up the SCAClientFactory selection mechanism git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@899196 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/oasisopen/sca/client/impl/SCAClientFactoryFinder.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'sca-java-2.x/trunk/modules/sca-api/src/main/java/org/oasisopen/sca/client') 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); -- cgit v1.2.3