svn commit: r1355234 - in /camel/branches/camel-2.8.x: ./ components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java

[ningjiang]

Author: ningjiang
Date: Fri Jun 29 04:01:38 2012
New Revision: 1355234

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

........
  r1350118 | ningjiang | 2012-06-14 16:05:14 +0800 (Thu, 14 Jun 2012) | 1 line
  
  Clean up the code of CxfConverter
........

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/converter/CxfConverter.java

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
  Merged /camel/branches/camel-2.9.x:r1350118

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/converter/CxfConverter.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java?rev=1355234&r1=1355233&r2=1355234&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
 (original)
+++ 
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
 Fri Jun 29 04:01:38 2012
@@ -17,6 +17,7 @@
 package org.apache.camel.component.cxf.converter;
 
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26,6 +27,7 @@ import java.util.Map;
 
 import javax.ws.rs.core.Response;
 import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPMessage;
 
 import org.apache.camel.Converter;
@@ -37,8 +39,7 @@ import org.apache.camel.component.cxf.Cx
 import org.apache.camel.component.cxf.CxfSpringEndpoint;
 import org.apache.camel.component.cxf.DataFormat;
 import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.spring.SpringCamelContext;
-import org.apache.camel.util.EndpointHelper;
+import org.apache.camel.util.IOHelper;
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageContentsList;
@@ -105,14 +106,10 @@ public final class CxfConverter {
     }
 
     @Converter
-    public static String soapMessageToString(final SOAPMessage soapMessage) {
+    public static String soapMessageToString(final SOAPMessage soapMessage, 
Exchange exchange) throws SOAPException, IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        try {
-            soapMessage.writeTo(baos);
-        } catch (Exception e) {
-            LOG.error("Get the exception when converting the SOAPMessage into 
String, the exception is " + e);
-        }
-        return baos.toString();
+        soapMessage.writeTo(baos);
+        return baos.toString(IOHelper.getCharsetName(exchange));
     }
     
     @Converter