You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by th...@apache.org on 2007/02/09 13:06:50 UTC
svn commit: r505264 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2:
transport/TransportUtils.java util/Builder.java
Author: thilina
Date: Fri Feb 9 04:06:49 2007
New Revision: 505264
URL: http://svn.apache.org/viewvc?view=rev&rev=505264
Log:
Commiting the change which I missed yesterday..
We need to pass charSetEncoding to the parser.. If not we might run in to issues with UTF-16
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Builder.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java?view=diff&rev=505264&r1=505263&r2=505264
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java Fri Feb 9 04:06:49 2007
@@ -208,7 +208,7 @@
// builder = Builder.getBuilder(inStream, charSetEnc,soapNamespaceURI);
}else if (contentType!=null)
{
- builder = Builder.getBuilderFromSelector(contentType, inStream, msgContext);
+ builder = Builder.getBuilderFromSelector(contentType, inStream, msgContext,charSetEnc);
}
if (builder==null)
{
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Builder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Builder.java?view=diff&rev=505264&r1=505263&r2=505264
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Builder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Builder.java Fri Feb 9 04:06:49 2007
@@ -318,7 +318,7 @@
* @throws AxisFault
*/
public static OMBuilder getBuilderFromSelector(String contentType,
- InputStream inputStream, MessageContext msgContext) throws AxisFault {
+ InputStream inputStream, MessageContext msgContext,String charSetEncoding) throws AxisFault {
int index = contentType.indexOf(';');
if (index>0)
{
@@ -328,9 +328,8 @@
.getAxisConfiguration().getMessageBuilder(contentType);
if (builderClass != null) {
try {
- OMBuilder builder = (OMBuilder) builderClass.newInstance();
- //REVIEW: The second parameter here is most likely incorrect, as the Axiom interface was changed without any comments and without anybody actually using it. At least the code compiles correctly now.
- builder.init(inputStream, null);
+ OMBuilder builder = (OMBuilder) builderClass.newInstance();
+ builder.init(inputStream, charSetEncoding);
// Setting the received content-type as the messageType to make
// sure that we respond using the received message serialisation
// format.
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org