svn commit: r1226229 - in /axis/axis1/java/trunk: axis-war/src/test/java/test/httpunit/JwsTest.java axis/src/main/java/org/apache/axis/transport/http/QSMethodHandler.java

[ve...@apache.org]

Author: veithen
Date: Sun Jan  1 10:26:33 2012
New Revision: 1226229

URL: http://svn.apache.org/viewvc?rev=1226229&view=rev
Log:
Fixed a charset encoding issue in QSMethodHandler.

Modified:
    axis/axis1/java/trunk/axis-war/src/test/java/test/httpunit/JwsTest.java
    axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/transport/http/QSMethodHandler.java

Modified: axis/axis1/java/trunk/axis-war/src/test/java/test/httpunit/JwsTest.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-war/src/test/java/test/httpunit/JwsTest.java?rev=1226229&r1=1226228&r2=1226229&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-war/src/test/java/test/httpunit/JwsTest.java (original)
+++ axis/axis1/java/trunk/axis-war/src/test/java/test/httpunit/JwsTest.java Sun Jan  1 10:26:33 2012
@@ -17,6 +17,8 @@
 
 package test.httpunit;
 
+import java.net.URLEncoder;
+
 import com.meterware.httpunit.WebRequest;
 import com.meterware.httpunit.GetMethodWebRequest;
 import com.meterware.httpunit.WebResponse;
@@ -122,14 +124,12 @@ public class JwsTest extends HttpUnitTes
      * send a complex unicode round the loop and see what happens
      * @throws Exception
      */
-    /* this is failing but it may be in the test code
     public void testEchoHeadersEchoUnicode() throws Exception {
         WebRequest request = new GetMethodWebRequest(url
-                + "/EchoHeaders.jws");
-        request.setParameter("method", "echo");
-        request.setParameter("param", "\u221a");
-        assertStringInBody(request, "\u221a");
+                + "/EchoHeaders.jws?method=echo&param=" + URLEncoder.encode("\u221a", "UTF-8"));
+        // TODO: Axis actually returns a character entity; may be related to AXIS-2342
+//        assertStringInBody(request, "\u221a");
+        assertStringInBody(request, "√");
     }
-    */
 
 }

Modified: axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/transport/http/QSMethodHandler.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/transport/http/QSMethodHandler.java?rev=1226229&r1=1226228&r2=1226229&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/transport/http/QSMethodHandler.java (original)
+++ axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/transport/http/QSMethodHandler.java Sun Jan  1 10:26:33 2012
@@ -24,7 +24,6 @@ import org.apache.axis.utils.Messages;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.ByteArrayInputStream;
 import java.io.PrintWriter;
 import java.util.Enumeration;
 
@@ -116,14 +115,12 @@ public class QSMethodHandler extends Abs
                 " xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\">" +
                 "<SOAP-ENV:Body>" + body + "</SOAP-ENV:Body>" +
                 "</SOAP-ENV:Envelope>";
-        ByteArrayInputStream istream =
-                new ByteArrayInputStream (msgtxt.getBytes());
         Message responseMsg = null;
 
         try {
             AxisServer engine = (AxisServer) msgContext.getProperty
                     (HTTPConstants.PLUGIN_ENGINE);
-            Message msg = new Message (istream, false);
+            Message msg = new Message (msgtxt, false);
 
             msgContext.setRequestMessage (msg);
             engine.invoke (msgContext);