Author: mmusaji Date: 2011-08-26 12:08:42 -0400 (Fri, 26 Aug 2011) New Revision: 14908 Modified: stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java Log: JBPAPP-6864 - Removed code from previously attempted fix by mistake. Also left EnvelopeBuilderDOM.java to return actual message in cases where ignoreParseError is false but new property is not used. This allows the original message to be returned to the client as before Modified: stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-08-26 14:27:44 UTC (rev 14907) +++ stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-08-26 16:08:42 UTC (rev 14908) @@ -271,7 +271,7 @@ }else { io = new IOException("Could not transmit message"); } - + io.initCause(th); throw io; } Modified: stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2011-08-26 14:27:44 UTC (rev 14907) +++ stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2011-08-26 16:08:42 UTC (rev 14908) @@ -95,6 +95,9 @@ return null; } + QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT; + throw new CommonSOAPFaultException(faultCode, ex.getMessage()); + } return build(soapMessage, domEnv); @@ -118,6 +121,9 @@ }else if (ignoreParseError) { //kept for backward compatibility return null; } + + QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT; + throw new CommonSOAPFaultException(faultCode, ex.getMessage()); } return build(soapMessage, domEnv); Modified: stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2011-08-26 14:27:44 UTC (rev 14907) +++ stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2011-08-26 16:08:42 UTC (rev 14908) @@ -286,10 +286,6 @@ { SOAPBody soapBody = soapEnv.getBody(); - - if (soapBody == null) { - soapBody = soapEnv.addBody(); - } if (atPartMargin()) { 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-26 14:27:44 UTC (rev 14907) +++ stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2011-08-26 16:08:42 UTC (rev 14908) @@ -288,15 +288,6 @@ { 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());