[jbossws-commits] JBossWS SVN: r16096 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2012-04-04 09:08:29 -0400 (Wed, 04 Apr 2012)
New Revision: 16096

Modified:
   stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java
Log:
Fixing test potentially messing up with client thread default bus


Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java	2012-04-04 13:05:15 UTC (rev 16095)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java	2012-04-04 13:08:29 UTC (rev 16096)
@@ -74,11 +74,17 @@
       Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
       Bus bus = BusFactory.getThreadDefaultBus(false);
       CustomClientLifeCycleListener listener = new CustomClientLifeCycleListener();
-      bus.getExtension(ClientLifeCycleManager.class).registerListener(listener);
-      assertEquals(0, listener.getCount());
-      EndpointOne portOne = (EndpointOne)serviceOne.getPort(EndpointOne.class);
-      assertEquals(1, listener.getCount());
-      assertEquals("Foo", portOne.echo("Foo"));
+      ClientLifeCycleManager mgr = bus.getExtension(ClientLifeCycleManager.class);
+      try {
+         mgr.registerListener(listener);
+         assertEquals(0, listener.getCount());
+         EndpointOne portOne = (EndpointOne)serviceOne.getPort(EndpointOne.class);
+         assertEquals(1, listener.getCount());
+         assertEquals("Foo", portOne.echo("Foo"));
+      } finally {
+         mgr.unRegisterListener(listener);
+      }
+      
    }
 
    private class CustomClientLifeCycleListener implements ClientLifeCycleListener