svn commit: r678732 - /activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java

[ningjiang]

Author: ningjiang
Date: Tue Jul 22 05:17:40 2008
New Revision: 678732

URL: http://svn.apache.org/viewvc?rev=678732&view=rev
Log:
CAMEL-741 CamelConduit's should check the TargetReference when creating its 
instance

Modified:
    
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java

Modified: 
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java?rev=678732&r1=678731&r2=678732&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
 (original)
+++ 
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
 Tue Jul 22 05:17:40 2008
@@ -63,7 +63,7 @@
     }
 
     public CamelConduit(CamelContext context, Bus b, EndpointInfo epInfo, 
EndpointReferenceType targetReference) {
-        super(targetReference);
+        super(getTargetReference(epInfo, targetReference, b));
         String address = epInfo.getAddress();
         if (address != null) {
             targetCamelEndpointUri = 
address.substring(CxfConstants.CAMEL_TRANSPORT_PREFIX.length());
@@ -165,9 +165,10 @@
                     CachedOutputStream outputStream = 
(CachedOutputStream)outMessage.getContent(OutputStream.class);
                     // Send out the request message here, copy the 
protocolHeader back
                     Map<String, List<String>> protocolHeader = 
CastUtils.cast((Map<?, ?>)outMessage.get(Message.PROTOCOL_HEADERS));
-                    String contentType = (String) 
outMessage.get(Message.CONTENT_TYPE);
+                    String contentType = 
(String)outMessage.get(Message.CONTENT_TYPE);
                     CxfSoapBinding.setProtocolHeader(ex.getIn().getHeaders(), 
protocolHeader);
                     ex.getIn().setHeader(CamelTransportConstants.CONTENT_TYPE, 
contentType);
+                    // TODO support different encoding
                     ex.getIn().setBody(outputStream.getBytes());
                     getLogger().log(Level.FINE, "template sending request: ", 
ex.getIn());
                 }