You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by as...@apache.org on 2007/03/22 07:10:32 UTC

svn commit: r521131 - in /webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp: ClientWorker.java LoggingNHttpServiceHandler.java

Author: asankha
Date: Wed Mar 21 23:10:31 2007
New Revision: 521131

URL: http://svn.apache.org/viewvc?view=rev&rev=521131
Log:
use charencoding with the new SOAP builder of Axis2
issue only a warning for connection reset by peer and not a error with a stack trace

Modified:
    webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/ClientWorker.java
    webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/LoggingNHttpServiceHandler.java

Modified: webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/ClientWorker.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/ClientWorker.java?view=diff&rev=521131&r1=521130&r2=521131
==============================================================================
--- webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/ClientWorker.java (original)
+++ webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/ClientWorker.java Wed Mar 21 23:10:31 2007
@@ -22,6 +22,7 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.WSDL2Constants;
 import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
 import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.transport.TransportUtils;
@@ -117,10 +118,19 @@
     public void run() {
         SOAPEnvelope envelope = null;
         try {
+            String contentType = response.getFirstHeader(HTTP.CONTENT_TYPE).getValue();
+            if (contentType.indexOf(HTTP.CHARSET_PARAM) > 0) {
+                responseMsgCtx.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
+                    contentType.substring(contentType.indexOf(HTTP.CHARSET_PARAM) +
+                    HTTP.CHARSET_PARAM.length()));
+            } else {
+                responseMsgCtx.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
+                    MessageContext.DEFAULT_CHAR_SET_ENCODING);
+            }
             envelope = TransportUtils.createSOAPMessage(
                 responseMsgCtx,
                 in,
-                response.getFirstHeader(HTTP.CONTENT_TYPE).getValue());
+                contentType);
             responseMsgCtx.setEnvelope(envelope);
 
         } catch (AxisFault af) {

Modified: webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/LoggingNHttpServiceHandler.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/LoggingNHttpServiceHandler.java?view=diff&rev=521131&r1=521130&r2=521131
==============================================================================
--- webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/LoggingNHttpServiceHandler.java (original)
+++ webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/LoggingNHttpServiceHandler.java Wed Mar 21 23:10:31 2007
@@ -62,7 +62,11 @@
     }
 
     public void exception(final NHttpServerConnection conn, final IOException ex) {
-        this.log.error("HTTP connection " + conn + ": " + ex.getMessage(), ex);
+        if (ex.getMessage().contains("Connection reset")) {
+            this.log.warn("HTTP connection " + conn + ": " + ex.getMessage());
+        } else {
+            this.log.error("HTTP connection " + conn + ": " + ex.getMessage(), ex);
+        }
         this.handler.exception(conn, ex);
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org