You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/10/22 02:36:35 UTC
svn commit: r1187611 - in /cxf/trunk:
rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
Author: dkulp
Date: Sat Oct 22 00:36:34 2011
New Revision: 1187611
URL: http://svn.apache.org/viewvc?rev=1187611&view=rev
Log:
Fix broken test. Make sure context classloader things override the
built ins.
Modified:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java?rev=1187611&r1=1187610&r2=1187611&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java Sat Oct 22 00:36:34 2011
@@ -141,10 +141,10 @@ public class ExtensionManagerImpl implem
}
}
final void load(String resource) throws IOException {
- load(resource, loader);
if (loader != getClass().getClassLoader()) {
load(resource, getClass().getClassLoader());
}
+ load(resource, loader);
}
final void load(String resource, ClassLoader l) throws IOException {
Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java?rev=1187611&r1=1187610&r2=1187611&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java Sat Oct 22 00:36:34 2011
@@ -72,23 +72,9 @@ public class BusExtensionLoadingTest ext
BusFactory factory = new CXFBusFactory();
Bus bus = factory.createBus();
assertNotNullExtensions(bus);
-
- ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader();
- try {
- Thread.currentThread().setContextClassLoader(new TestClassLoader());
- bus = factory.createBus();
- assertNullExtensions(bus);
- } finally {
- Thread.currentThread().setContextClassLoader(origClassLoader);
- }
}
- private static void assertNullExtensions(Bus bus) {
- assertNull(bus.getExtension(WSDLManager.class));
- assertNull(bus.getExtension(QueryHandlerRegistry.class));
- assertNull(bus.getExtension(ServerRegistry.class));
- assertNull(bus.getExtension(HeaderManager.class));
- }
+
private static void assertNotNullExtensions(Bus bus) {
assertNotNull(bus.getExtension(WSDLManager.class));