svn commit: r998785 - /synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientWorker.java

[hi...@apache.org]

Author: hiranya
Date: Mon Sep 20 05:32:20 2010
New Revision: 998785

URL: http://svn.apache.org/viewvc?rev=998785&view=rev
Log:
Fixing SYNAPSE-662 


Modified:
    synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientWorker.java

Modified: synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientWorker.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientWorker.java?rev=998785&r1=998784&r2=998785&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientWorker.java (original)
+++ synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientWorker.java Mon Sep 20 05:32:20 2010
@@ -43,7 +43,6 @@ import javax.xml.stream.XMLStreamExcepti
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -71,7 +70,9 @@ public class ClientWorker implements Run
      * context sent
      * @param cfgCtx the Axis2 configuration context
      * @param in the InputStream to read the body of the response message received
+     * @param response HTTP response received from the server
      * @param outMsgCtx the original outgoing message context (i.e. corresponding request)
+     * @param endpointURLPrefix The endpoint URL prefix
      */
     public ClientWorker(ConfigurationContext cfgCtx, InputStream in,
         HttpResponse response, MessageContext outMsgCtx, String endpointURLPrefix) {
@@ -187,9 +188,7 @@ public class ClientWorker implements Run
                 }
 
                 responseMsgCtx.setProperty(
-                    Constants.Configuration.CHARACTER_SET_ENCODING,
-                    contentType.indexOf(HTTP.CHARSET_PARAM) > 0 ?
-                        charSetEnc : MessageContext.DEFAULT_CHAR_SET_ENCODING);
+                        Constants.Configuration.CHARACTER_SET_ENCODING, charSetEnc);
 
                 // workaround for Axis2 TransportUtils.createSOAPMessage() issue, where a response
                 // of content type "text/xml" is thought to be REST if !MC.isServerSide(). This
@@ -291,10 +290,4 @@ public class ClientWorker implements Run
         // Unable to determine the content type - Return default value
         return NhttpConstants.DEFAULT_CONTENT_TYPE;
     }
-
-    // -------------- utility methods -------------
-    private void handleException(String msg, Exception e) throws AxisFault {
-        log.error(msg, e);
-        throw new AxisFault(msg, e);
-    }
 }