Author: mmusaji
Date: 2011-08-02 05:56:23 -0400 (Tue, 02 Aug 2011)
New Revision: 14776
Modified:
stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/.classpath
stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java
stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java
Log:
JBPAPP-6864 set ignoreParseError to false
Modified: stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/.classpath
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/.classpath 2011-08-01
08:30:56 UTC (rev 14775)
+++ stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/.classpath 2011-08-02
09:56:23 UTC (rev 14776)
@@ -9,5 +9,9 @@
<classpathentry kind="src" output="modules/core/target/classes"
path="modules/core/src/main/java"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+ <classpathentry kind="con"
path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss
5.1.1 npeInvalidCharWS Runtime"/>
+ <classpathentry kind="lib"
path="/NotBackedUp/JBoss_instances/JBoss5.1.1-unsigned/lib/endorsed/xercesImpl.jar"/>
+ <classpathentry kind="lib"
path="/NotBackedUp/JBoss_instances/JBoss5.1.1-unsigned/lib/endorsed/xalan.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified:
stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
---
stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2011-08-01
08:30:56 UTC (rev 14775)
+++
stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2011-08-02
09:56:23 UTC (rev 14776)
@@ -288,6 +288,15 @@
{
envBuilder =
(EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), null);
}
+ //if inputstream is empty, no need to build
+ if (inputStream.markSupported()) {
+ inputStream.mark(1);
+ final int bytesRead = inputStream.read(new byte[1]);
+ inputStream.reset();
+ if (bytesRead == -1) {
+ return soapMessage;
+ }
+ }
// Build the payload
envBuilder.setStyle(getStyle());
Modified:
stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java
===================================================================
---
stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2011-08-01
08:30:56 UTC (rev 14775)
+++
stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2011-08-02
09:56:23 UTC (rev 14776)
@@ -47,7 +47,7 @@
try
{
- SOAPMessage soapMsg = getMessageFactory().createMessage(null, inputStream,
true);
+ SOAPMessage soapMsg = getMessageFactory().createMessage(null, inputStream,
false);
return soapMsg;
}
Modified:
stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java
===================================================================
---
stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java 2011-08-01
08:30:56 UTC (rev 14775)
+++
stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java 2011-08-02
09:56:23 UTC (rev 14776)
@@ -79,7 +79,8 @@
if (resCode != HttpServletResponse.SC_NO_CONTENT)
{
MimeHeaders mimeHeaders = getMimeHeaders(metadata);
- soapMsg = getMessageFactory().createMessage(mimeHeaders, inputStream, true);
+ //[JBWS-2651] modify the ignoreParseError to false
+ soapMsg = getMessageFactory().createMessage(mimeHeaders, inputStream,
false);
}
return soapMsg;