svn commit: r1030316 - /camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfMessageHelper.java

[ni...@apache.org]

Author: ningjiang
Date: Wed Nov  3 02:29:39 2010
New Revision: 1030316

URL: http://svn.apache.org/viewvc?rev=1030316&view=rev
Log:
CAMEL-3269 also updated the method of getCxfOutMessage

Modified:
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfMessageHelper.java

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfMessageHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfMessageHelper.java?rev=1030316&r1=1030315&r2=1030316&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfMessageHelper.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfMessageHelper.java Wed Nov  3 02:29:39 2010
@@ -67,7 +67,7 @@ public final class CxfMessageHelper {
         return answer;
     }
 
-    // TODO: This method is not used
+    //This method is not used, and will be removed in Camel 3.0
     @Deprecated
     public static org.apache.cxf.message.Message getCxfOutMessage(HeaderFilterStrategy headerFilterStrategy,
                                                                   org.apache.camel.Exchange exchange,
@@ -83,7 +83,7 @@ public final class CxfMessageHelper {
         cxfExchange.setOutMessage(outMessage);
 
         org.apache.camel.Message message;
-        if (isClient) {
+        if (isClient && exchange.hasOut()) {
             message = exchange.getIn();
         } else {
             message = exchange.getOut();