camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1239010 - in /camel/branches/camel-2.8.x: ./ components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfClientCallback.java
Date Wed, 01 Feb 2012 08:53:24 GMT
Author: ningjiang
Date: Wed Feb  1 08:53:24 2012
New Revision: 1239010

URL: http://svn.apache.org/viewvc?rev=1239010&view=rev
Log:
Merged revisions 1238942 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x

................
  r1238942 | ningjiang | 2012-02-01 13:30:26 +0800 (Wed, 01 Feb 2012) | 9 lines
  
  Merged revisions 1238937 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1238937 | ningjiang | 2012-02-01 12:44:25 +0800 (Wed, 01 Feb 2012) | 1 line
    
    CAMEL-4945 avoiding to call the done for oneway operation
  ........
................

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfClientCallback.java

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  1 08:53:24 2012
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.9.x:1227549,1228229,1229567,1234054,1236672
-/camel/trunk:1226860,1227540,1228223,1229565,1234043,1236667
+/camel/branches/camel-2.9.x:1227549,1228229,1229567,1234054,1236672,1238942
+/camel/trunk:1226860,1227540,1228223,1229565,1234043,1236667,1238937

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfClientCallback.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfClientCallback.java?rev=1239010&r1=1239009&r2=1239010&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfClientCallback.java
(original)
+++ camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfClientCallback.java
Wed Feb  1 08:53:24 2012
@@ -50,16 +50,19 @@ public class CxfClientCallback extends C
         try {
             super.handleResponse(ctx, res);            
         } finally {
-            // bind the CXF response to Camel exchange
+            // bind the CXF response to Camel exchange and
+            // call camel callback
+            // for one way messages callback is already called in 
+            // process method of org.apache.camel.component.cxf.CxfProducer
             if (!boi.getOperationInfo().isOneWay()) {
                 // copy the InMessage header to OutMessage header
                 camelExchange.getOut().getHeaders().putAll(camelExchange.getIn().getHeaders());
                 binding.populateExchangeFromCxfResponse(camelExchange, cxfExchange, ctx);
+                camelAsyncCallback.done(false);
             }
             if (LOG.isDebugEnabled()) {
                 LOG.debug("{} calling handleResponse", Thread.currentThread().getName());
             }
-            camelAsyncCallback.done(false);
         }
     }
     
@@ -68,16 +71,19 @@ public class CxfClientCallback extends C
             super.handleException(ctx, ex);
             camelExchange.setException(ex);
         } finally {
-            // copy the context information
+            // copy the context information and 
+            // call camel callback
+            // for one way messages callback is already called in 
+            // process method of org.apache.camel.component.cxf.CxfProducer
             if (!boi.getOperationInfo().isOneWay()) {
                 // copy the InMessage header to OutMessage header
                 camelExchange.getOut().getHeaders().putAll(camelExchange.getIn().getHeaders());
                 binding.populateExchangeFromCxfResponse(camelExchange, cxfExchange, ctx);
+                camelAsyncCallback.done(false);
             }
             if (LOG.isDebugEnabled()) {
                 LOG.debug("{} calling handleException", Thread.currentThread().getName());
             }
-            camelAsyncCallback.done(false);
         }
     }        
 



Mime
View raw message