You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cs...@apache.org on 2011/06/16 17:53:40 UTC
svn commit: r1136497 - in
/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf:
CxfClientCallback.java CxfProducer.java
Author: cschneider
Date: Thu Jun 16 15:53:40 2011
New Revision: 1136497
URL: http://svn.apache.org/viewvc?rev=1136497&view=rev
Log:
CAMEL-4114 change CxfClientCallback to not need CxfEndpoint
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfClientCallback.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfClientCallback.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfClientCallback.java?rev=1136497&r1=1136496&r2=1136497&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfClientCallback.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfClientCallback.java Thu Jun 16 15:53:40 2011
@@ -32,18 +32,18 @@ public class CxfClientCallback extends C
private final Exchange camelExchange;
private final org.apache.cxf.message.Exchange cxfExchange;
private final BindingOperationInfo boi;
- private final CxfEndpoint endpoint;
+ private final CxfBinding binding;
public CxfClientCallback(AsyncCallback callback,
Exchange camelExchange,
org.apache.cxf.message.Exchange cxfExchange,
BindingOperationInfo boi,
- CxfEndpoint endpoint) {
+ CxfBinding binding) {
this.camelAsyncCallback = callback;
this.camelExchange = camelExchange;
this.cxfExchange = cxfExchange;
this.boi = boi;
- this.endpoint = endpoint;
+ this.binding = binding;
}
public void handleResponse(Map<String, Object> ctx, Object[] res) {
@@ -54,8 +54,7 @@ public class CxfClientCallback extends C
if (!boi.getOperationInfo().isOneWay()) {
// copy the InMessage header to OutMessage header
camelExchange.getOut().getHeaders().putAll(camelExchange.getIn().getHeaders());
- endpoint.getCxfBinding().populateExchangeFromCxfResponse(camelExchange, cxfExchange,
- ctx);
+ binding.populateExchangeFromCxfResponse(camelExchange, cxfExchange, ctx);
}
if (LOG.isDebugEnabled()) {
LOG.debug("{} calling handleResponse", Thread.currentThread().getName());
@@ -73,8 +72,7 @@ public class CxfClientCallback extends C
if (!boi.getOperationInfo().isOneWay()) {
// copy the InMessage header to OutMessage header
camelExchange.getOut().getHeaders().putAll(camelExchange.getIn().getHeaders());
- endpoint.getCxfBinding().populateExchangeFromCxfResponse(camelExchange, cxfExchange,
- ctx);
+ binding.populateExchangeFromCxfResponse(camelExchange, cxfExchange, ctx);
}
if (LOG.isDebugEnabled()) {
LOG.debug("{} calling handleException", Thread.currentThread().getName());
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?rev=1136497&r1=1136496&r2=1136497&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java Thu Jun 16 15:53:40 2011
@@ -88,7 +88,8 @@ public class CxfProducer extends Default
invocationContext.put(Client.RESPONSE_CONTEXT, responseContext);
invocationContext.put(Client.REQUEST_CONTEXT, prepareRequest(camelExchange, cxfExchange));
- CxfClientCallback cxfClientCallback = new CxfClientCallback(callback, camelExchange, cxfExchange, boi, endpoint);
+ CxfClientCallback cxfClientCallback = new CxfClientCallback(callback, camelExchange, cxfExchange, boi,
+ endpoint.getCxfBinding());
// send the CXF async request
client.invoke(cxfClientCallback, boi, getParams(endpoint, camelExchange),
invocationContext, cxfExchange);