You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2006/04/17 17:54:34 UTC
svn commit: r394717 -
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
Author: dims
Date: Mon Apr 17 08:54:33 2006
New Revision: 394717
URL: http://svn.apache.org/viewcvs?rev=394717&view=rev
Log:
Fix for AXIS2-554 - NullPointer in HTTPTransportUtils if Content Type is missing
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java?rev=394717&r1=394716&r2=394717&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java Mon Apr 17 08:54:33 2006
@@ -251,7 +251,7 @@
SOAPFactory soapFactory = new SOAP11Factory();
builder = new StAXOMBuilder(xmlreader);
- builder.setOMBuilderFactory(soapFactory);
+ builder.setOMBuilderFactory(soapFactory);
envelope = soapFactory.getDefaultEnvelope();
envelope.getBody().addChild(builder.getDocumentElement());
}
@@ -260,12 +260,20 @@
xmlreader, SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
envelope = (SOAPEnvelope) builder.getDocumentElement();
}
- } else {
- builder = new StAXSOAPModelBuilder(
- xmlreader, SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
- envelope = (SOAPEnvelope) builder.getDocumentElement();
}
}
+ }
+
+ if(builder == null){
+ XMLStreamReader xmlreader = XMLInputFactory.newInstance().createXMLStreamReader(in,
+ MessageContext.DEFAULT_CHAR_SET_ENCODING);
+
+ // Set the encoding scheme in the message context
+ msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING,
+ MessageContext.DEFAULT_CHAR_SET_ENCODING);
+ builder = new StAXSOAPModelBuilder(
+ xmlreader, SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+ envelope = (SOAPEnvelope) builder.getDocumentElement();
}
String charsetEncoding = builder.getDocument().getCharsetEncoding();