[jbossws-commits] JBossWS SVN: r14846 - in stack/native/branches/jbossws-native-3.1.2/modules: core/src/main/java/org/jboss/ws/core/client and 2 other directories.

Author: mmusaji Date: 2011-08-15 11:01:43 -0400 (Mon, 15 Aug 2011) New Revision: 14846 Removed: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2651/ Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java Log: JBPAPP-6860 - Backed out changes due to test failing when running TCK JAX-WS tests. Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java 2011-08-15 12:59:55 UTC (rev 14845) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java 2011-08-15 15:01:43 UTC (rev 14846) @@ -32,7 +32,6 @@ { private QName faultCode; private String faultString; - private Throwable throwable; public CommonSOAPFaultException(QName faultCode, String faultString) { @@ -42,15 +41,6 @@ this.faultString = faultString; } - public CommonSOAPFaultException(QName faultCode, Throwable throwable) { - - super(throwable.getMessage(), throwable); - - this.faultCode = faultCode; - this.throwable = throwable; - - } - public QName getFaultCode() { return faultCode; Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-08-15 12:59:55 UTC (rev 14845) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-08-15 15:01:43 UTC (rev 14846) @@ -264,14 +264,7 @@ throw new WSTimeoutException("Timeout after: " + timeout + "ms", new Long(timeout.toString())); } - IOException io = null; - - if(th.getCause().getMessage() != null) { - io = new IOException(th.getCause().getMessage()); - }else { - io = new IOException("Could not transmit message"); - } - + IOException io = new IOException("Could not transmit message"); io.initCause(th); throw io; } Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2011-08-15 12:59:55 UTC (rev 14845) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2011-08-15 15:01:43 UTC (rev 14846) @@ -91,7 +91,7 @@ return null; } QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT; - throw new CommonSOAPFaultException(faultCode, ex); + throw new CommonSOAPFaultException(faultCode, ex.getMessage()); } return build(soapMessage, domEnv); Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2011-08-15 12:59:55 UTC (rev 14845) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2011-08-15 15:01:43 UTC (rev 14846) @@ -287,10 +287,6 @@ SOAPBody soapBody = soapEnv.getBody(); - if (soapBody == null) { - soapBody = soapEnv.addBody(); - } - if (atPartMargin()) { // the env:Body element Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2011-08-15 12:59:55 UTC (rev 14845) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2011-08-15 15:01:43 UTC (rev 14846) @@ -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()); Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2011-08-15 12:59:55 UTC (rev 14845) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2011-08-15 15:01:43 UTC (rev 14846) @@ -47,7 +47,7 @@ try { - SOAPMessage soapMsg = getMessageFactory().createMessage(null, inputStream, false); + SOAPMessage soapMsg = getMessageFactory().createMessage(null, inputStream, true); return soapMsg; } Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java 2011-08-15 12:59:55 UTC (rev 14845) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java 2011-08-15 15:01:43 UTC (rev 14846) @@ -79,8 +79,7 @@ if (resCode != HttpServletResponse.SC_NO_CONTENT) { MimeHeaders mimeHeaders = getMimeHeaders(metadata); - //[JBWS-2651] modify the ignoreParseError to false - soapMsg = getMessageFactory().createMessage(mimeHeaders, inputStream, false); + soapMsg = getMessageFactory().createMessage(mimeHeaders, inputStream, true); } return soapMsg;