Author: alessio.soldano(a)jboss.com Date: 2012-01-30 12:47:15 -0500 (Mon, 30 Jan 2012) New Revision: 15544 Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java Log: [JBPAPP-7271] Fixing testcase Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java 2012-01-30 16:41:54 UTC (rev 15543) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java 2012-01-30 17:47:15 UTC (rev 15544) @@ -56,10 +56,10 @@ { checkThreadBus(bus); } - checkDefaultBus(initialDefaultBus); + checkDefaultBus(initialDefaultBus != null ? initialDefaultBus : bus); //on JBossWS 3.x series integration, the default bus is set if null BusFactory.setThreadDefaultBus(initialThreadBus); checkThreadBus(initialThreadBus); - checkDefaultBus(initialDefaultBus); + checkDefaultBus(initialDefaultBus != null ? initialDefaultBus : bus); } public static void testSOAPConnection(String host) throws BusTestException, Exception