svn commit: r745471 - in /servicemix/components/bindings/servicemix-cxf-bc/trunk/src: main/java/org/apache/servicemix/cxfbc/ test/java/org/apache/servicemix/cxfbc/ws/addressing/ test/java/org/apache/servicemix/cxfbc/ws/rm/

[ffang]

Author: ffang
Date: Wed Feb 18 10:37:36 2009
New Revision: 745471

URL: http://svn.apache.org/viewvc?rev=745471&view=rev
Log:
[SM-1795|SMXCOMP-9]if cxf endpoint use specific bus, then we should shutdown 
the bus cleanly when shutdown the endpoint

Modified:
    
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java
    
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcAddressingTest.java
    
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java

Modified: 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java?rev=745471&r1=745470&r2=745471&view=diff
==============================================================================
--- 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java
 (original)
+++ 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java
 Wed Feb 18 10:37:36 2009
@@ -366,6 +366,11 @@
             bus.shutdown(false);
             bus = null;
         }
+        if (!isComponentBus()) {
+            //if use the endpoint own bus, then shutdown it
+            bus.shutdown(true);
+            bus = null;
+        }
         super.deactivate();
     }
 
@@ -566,6 +571,10 @@
         }
     }
 
+    private boolean isComponentBus() {
+        return getBus() ==  ((CxfBcComponent) 
getServiceUnit().getComponent()).getBus();
+    }
+
     /**
            * Specifies the HTTP address to which requests are sent. This value
            * will overide any value specified in the WSDL.

Modified: 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcAddressingTest.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcAddressingTest.java?rev=745471&r1=745470&r2=745471&view=diff
==============================================================================
--- 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcAddressingTest.java
 (original)
+++ 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcAddressingTest.java
 Wed Feb 18 10:37:36 2009
@@ -164,6 +164,7 @@
             jbi = null;
         }
         BusFactory.setDefaultBus(null);
+        Thread.sleep(10000);
         super.tearDown();
     }
     

Modified: 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java?rev=745471&r1=745470&r2=745471&view=diff
==============================================================================
--- 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java
 (original)
+++ 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java
 Wed Feb 18 10:37:36 2009
@@ -144,6 +144,7 @@
             jbi.destroy();
             jbi = null;
         }
+        Thread.sleep(10000);
     }
 
     /**