svn commit: r744310 - in /camel/branches/camel-1.x/components/camel-cxf/src: main/java/org/apache/camel/component/cxf/CxfBinding.java test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java

[wtam]

Author: wtam
Date: Sat Feb 14 00:19:02 2009
New Revision: 744310

URL: http://svn.apache.org/viewvc?rev=744310&view=rev
Log:
[CAMEL-1340]  Client side (i.e. CxfProvider) Jaxws handler's handleMessage() 
does not get called

Modified:
    
camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java
    
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java

Modified: 
camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java?rev=744310&r1=744309&r2=744310&view=diff
==============================================================================
--- 
camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java
 (original)
+++ 
camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java
 Sat Feb 14 00:19:02 2009
@@ -22,7 +22,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.xml.ws.BindingProvider;
 import javax.xml.ws.handler.MessageContext;
 import javax.xml.ws.handler.MessageContext.Scope;
 
@@ -32,6 +31,7 @@
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.jaxws.context.WrappedMessageContext;
+import org.apache.cxf.jaxws.handler.HandlerChainInvoker;
 import org.apache.cxf.message.Message;
 
 /**
@@ -106,6 +106,10 @@
             //Allows other components to pass properties into cxf request 
context
             requestContext.putAll(exchange.getProperties());
         }
+        
+        // Make sure we don't propagate HandleChainInvoker as it can mess up 
JAXWS handler
+        requestContext.remove(HandlerChainInvoker.class.getName());
+        
         answer.put(Client.REQUEST_CONTEXT, requestContext);
 
         return answer;

Modified: 
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java?rev=744310&r1=744309&r2=744310&view=diff
==============================================================================
--- 
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
 (original)
+++ 
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
 Sat Feb 14 00:19:02 2009
@@ -123,9 +123,11 @@
     }
 
     protected void verifyJaxwsHandlers(JaxwsTestHandler fromHandler, 
JaxwsTestHandler toHandler) {
-        assertEquals(8, fromHandler.getFaultCount());
-        assertEquals(11, fromHandler.getMessageCount());
+        assertEquals(2, fromHandler.getFaultCount());
+        assertEquals(4, fromHandler.getMessageCount());
         assertEquals(7, toHandler.getGetHeadersCount());
+        assertEquals(8, toHandler.getMessageCount());
+        assertEquals(6, toHandler.getFaultCount());
         
     }