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/24 20:44:34 UTC
svn commit: r1188285 - in /cxf/branches/2.4.x-fixes: ./
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: Mon Oct 24 18:44:33 2011
New Revision: 1188285
URL: http://svn.apache.org/viewvc?rev=1188285&view=rev
Log:
Merged revisions 1187611 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1187611 | dkulp | 2011-10-21 20:36:34 -0400 (Fri, 21 Oct 2011) | 2 lines
Fix broken test. Make sure context classloader things override the
built ins.
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java?rev=1188285&r1=1188284&r2=1188285&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java (original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java Mon Oct 24 18:44:33 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/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java?rev=1188285&r1=1188284&r2=1188285&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java (original)
+++ cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java Mon Oct 24 18:44:33 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));