svn commit: r555850 - in /incubator/cxf/trunk/rt: core/src/main/java/org/apache/cxf/interceptor/ transports/jbi/src/main/java/org/apache/cxf/transport/jbi/

[ffang]

Author: ffang
Date: Thu Jul 12 20:02:34 2007
New Revision: 555850

URL: http://svn.apache.org/viewvc?view=rev&rev=555850
Log:
add getJBIDispatcherUtil method of JBIDestination for servicemix integration

Modified:
    
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
    
incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBIDestination.java
    
incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBIDispatcherUtil.java

Modified: 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java?view=diff&rev=555850&r1=555849&r2=555850
==============================================================================
--- 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
 (original)
+++ 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
 Thu Jul 12 20:02:34 2007
@@ -31,6 +31,7 @@
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.phase.PhaseInterceptorChain;
+import org.apache.cxf.service.model.BindingFaultInfo;
 import org.apache.cxf.transport.MessageObserver;
 
 public abstract class AbstractFaultChainInitiatorObserver implements 
MessageObserver {
@@ -70,6 +71,9 @@
             }
             exchange.setOutMessage(null);
             exchange.setOutFaultMessage(faultMessage);
+            if (message.get(BindingFaultInfo.class) != null) {
+                faultMessage.put(BindingFaultInfo.class, 
message.get(BindingFaultInfo.class));
+            }
         } else {
             faultMessage = message;
             exchange.setInMessage(null);

Modified: 
incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBIDestination.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBIDestination.java?view=diff&rev=555850&r1=555849&r2=555850
==============================================================================
--- 
incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBIDestination.java
 (original)
+++ 
incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBIDestination.java
 Thu Jul 12 20:02:34 2007
@@ -76,6 +76,9 @@
         dispatcherUtil.activateDispatch();
     }
 
+    public JBIDispatcherUtil getJBIDispatcherUtil() {
+        return dispatcherUtil;
+    }
     
     // this should deal with the cxf message 
     protected class BackChannelConduit extends AbstractConduit {

Modified: 
incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBIDispatcherUtil.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBIDispatcherUtil.java?view=diff&rev=555850&r1=555849&r2=555850
==============================================================================
--- 
incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBIDispatcherUtil.java
 (original)
+++ 
incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBIDispatcherUtil.java
 Thu Jul 12 20:02:34 2007
@@ -61,7 +61,7 @@
     
     public void activateDispatch() {
         activeEndpoints++;
-        if (!running) {
+        if (!running && channel != null) {
             new Thread(new JBIDispatcher()).start();
         }
     }