svn commit: r644220 - in /servicemix/smx3/branches/servicemix-3.2.2: core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/ deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/ deployables/serviceen...

[ffang]

Author: ffang
Date: Thu Apr  3 01:31:31 2008
New Revision: 644220

URL: http://svn.apache.org/viewvc?rev=644220&view=rev
Log:
sync up changes to 3.2.2 release branch

Modified:
    
servicemix/smx3/branches/servicemix-3.2.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/AbstractFlow.java
    
servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcComponent.java
    
servicemix/smx3/branches/servicemix-3.2.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java

Modified: 
servicemix/smx3/branches/servicemix-3.2.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/AbstractFlow.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/AbstractFlow.java?rev=644220&r1=644219&r2=644220&view=diff
==============================================================================
--- 
servicemix/smx3/branches/servicemix-3.2.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/AbstractFlow.java
 (original)
+++ 
servicemix/smx3/branches/servicemix-3.2.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/AbstractFlow.java
 Thu Apr  3 01:31:31 2008
@@ -167,7 +167,12 @@
         ComponentMBeanImpl lcc = 
broker.getContainer().getRegistry().getComponent(id.getName());
         if (lcc != null) {
             if (lcc.getDeliveryChannel() != null) {
-                lcc.getDeliveryChannel().processInBound(me);
+                try {
+                    lock.readLock().lock();
+                    lcc.getDeliveryChannel().processInBound(me);
+                } finally {
+                    lock.readLock().unlock();
+                }
             } else {
                 throw new MessagingException("Component " + id.getName() + " 
is shut down");
             }

Modified: 
servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcComponent.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcComponent.java?rev=644220&r1=644219&r2=644220&view=diff
==============================================================================
--- 
servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcComponent.java
 (original)
+++ 
servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcComponent.java
 Thu Apr  3 01:31:31 2008
@@ -67,7 +67,10 @@
             SpringBusFactory bf = new SpringBusFactory();
             bus = bf.createBus(getBusConfig());
         } else {
-            bus = BusFactory.newInstance().createBus();
+            bus = BusFactory.getDefaultBus();
+            if (bus == null) {
+                bus = BusFactory.newInstance().createBus();
+            }
         }
         super.doInit();
     }

Modified: 
servicemix/smx3/branches/servicemix-3.2.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java?rev=644220&r1=644219&r2=644220&view=diff
==============================================================================
--- 
servicemix/smx3/branches/servicemix-3.2.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
 (original)
+++ 
servicemix/smx3/branches/servicemix-3.2.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
 Thu Apr  3 01:31:31 2008
@@ -30,6 +30,7 @@
 import javax.jbi.messaging.ExchangeStatus;
 import javax.jbi.messaging.MessageExchange;
 import javax.wsdl.WSDLException;
+import javax.wsdl.factory.WSDLFactory;
 import javax.xml.namespace.QName;
 import javax.xml.ws.WebServiceRef;
 
@@ -220,6 +221,7 @@
             definition = new ServiceWSDLBuilder(getBus(), endpoint.getServer()
                     .getEndpoint().getService().getServiceInfos().iterator()
                     .next()).build();
+            description = 
WSDLFactory.newInstance().newWSDLWriter().getDocument(definition);
         } catch (WSDLException e) {
             throw new DeploymentException(e);
         }