svn commit: r1410415 - /cxf/branches/2.6.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java

[dkulp]

Author: dkulp
Date: Fri Nov 16 15:58:44 2012
New Revision: 1410415

URL: http://svn.apache.org/viewvc?rev=1410415&view=rev
Log:
Merged revisions 1410182 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1410182 | dkulp | 2012-11-15 22:11:35 -0500 (Thu, 15 Nov 2012) | 2 lines

  Make sure bus is shutdown

........

Modified:
    
cxf/branches/2.6.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java

Modified: 
cxf/branches/2.6.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java?rev=1410415&r1=1410414&r2=1410415&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
 Fri Nov 16 15:58:44 2012
@@ -42,6 +42,7 @@ public class RMUtilsTest extends Assert 
     
     @Before
     public void setUp() {
+
         control = EasyMock.createNiceControl();
     }
 
@@ -79,15 +80,18 @@ public class RMUtilsTest extends Assert 
 
         // this test makes sure that an automatically generated id will be
         // mapped to the static default bus name "cxf".
+        System.out.println("bus: " + BusFactory.getThreadDefaultBus(false));
         control.reset();
         EasyMock.expect(e.getEndpointInfo()).andReturn(ei).times(2);
         EasyMock.expect(ei.getName()).andReturn(eqn);
         EasyMock.expect(ei.getService()).andReturn(si);
         EasyMock.expect(si.getName()).andReturn(sqn);
         control.replay();
+        Bus bus = BusFactory.getDefaultBus();
         assertEquals("{ns1}service.{ns2}endpoint@" + Bus.DEFAULT_BUS_ID, 
-                     RMUtils.getEndpointIdentifier(e, 
BusFactory.getDefaultBus()));
-
+                     RMUtils.getEndpointIdentifier(e, bus));
+        bus.shutdown(true);
+        
         // a generated bundle artifact bus
         control.reset();
         EasyMock.expect(e.getEndpointInfo()).andReturn(ei).times(2);