Author: darran.lofthouse(a)jboss.com Date: 2007-04-25 06:31:04 -0400 (Wed, 25 Apr 2007) New Revision: 2918 Modified: branches/dlofthouse/JBWS-1625/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java branches/dlofthouse/JBWS-1625/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java Log: Remove double contents of SOAP body when a DOMSource is used in setContent(). Modified: branches/dlofthouse/JBWS-1625/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java =================================================================== --- branches/dlofthouse/JBWS-1625/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-04-25 10:08:25 UTC (rev 2917) +++ branches/dlofthouse/JBWS-1625/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-04-25 10:31:04 UTC (rev 2918) @@ -115,7 +115,7 @@ { // Construct the envelope SOAPPartImpl soapPart = (SOAPPartImpl)soapMessage.getSOAPPart(); - SOAPEnvelopeImpl soapEnv = new SOAPEnvelopeImpl(soapPart, soapFactory.createElement(domEnv, false), false); + SOAPEnvelopeImpl soapEnv = new SOAPEnvelopeImpl(soapPart, domEnv.getPrefix(), domEnv.getNamespaceURI(), false); Document ownerDoc = soapEnv.getOwnerDocument(); DOMUtils.copyAttributes(soapEnv, domEnv); Modified: branches/dlofthouse/JBWS-1625/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java =================================================================== --- branches/dlofthouse/JBWS-1625/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java 2007-04-25 10:08:25 UTC (rev 2917) +++ branches/dlofthouse/JBWS-1625/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java 2007-04-25 10:31:04 UTC (rev 2918) @@ -77,13 +77,13 @@ addBody(); } } - - /** Construct a SOAP envelope for the given SOAP version URI. + + /** Construct a SOAP envelope for the given SOAP version URI and prefix. */ - SOAPEnvelopeImpl(SOAPPartImpl soapPart, String namespace, boolean addHeaderAndBody) throws SOAPException + SOAPEnvelopeImpl(SOAPPartImpl soapPart, String prefix, String namespace, boolean addHeaderAndBody) throws SOAPException { - super("Envelope", Constants.PREFIX_ENV, namespace); - + super("Envelope", prefix, namespace); + this.soapPart = soapPart; soapPart.setEnvelope(this); @@ -97,6 +97,13 @@ } } + /** Construct a SOAP envelope for the given SOAP version URI. + */ + SOAPEnvelopeImpl(SOAPPartImpl soapPart, String namespace, boolean addHeaderAndBody) throws SOAPException + { + this(soapPart,Constants.PREFIX_ENV, namespace,addHeaderAndBody); + } + public SOAPMessage getSOAPMessage() { return soapPart.getSOAPMessage();