Return-Path: Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 69257 invoked by uid 500); 18 Mar 2003 18:36:04 -0000 Mailing-List: contact axis-dev-help@ws.apache.org; run by ezmlm Precedence: bulk Reply-To: axis-dev@ws.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list axis-dev@ws.apache.org Received: (qmail 69248 invoked by uid 500); 18 Mar 2003 18:36:04 -0000 Delivered-To: apmail-xml-axis-cvs@apache.org Date: 18 Mar 2003 18:36:03 -0000 Message-ID: <20030318183603.82509.qmail@icarus.apache.org> From: jmsnell@apache.org To: xml-axis-cvs@apache.org Subject: cvs commit: xml-axis/java/src/org/apache/axis/message SOAPHeader.java SOAPEnvelope.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N jmsnell 2003/03/18 10:36:03 Modified: java/src/org/apache/axis/message SOAPHeader.java SOAPEnvelope.java Log: Revision Changes Path 1.70 +3 -3 xml-axis/java/src/org/apache/axis/message/SOAPHeader.java Index: SOAPHeader.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPHeader.java,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- SOAPHeader.java 18 Mar 2003 16:42:57 -0000 1.69 +++ SOAPHeader.java 18 Mar 2003 18:36:02 -0000 1.70 @@ -94,8 +94,8 @@ SOAPHeader(SOAPEnvelope env, SOAPConstants soapConsts) { super(Constants.ELEM_HEADER, Constants.NS_PREFIX_SOAP_ENV, - soapConsts != null? soapConsts.getEnvelopeURI() : SOAPConstants.SOAP11_CONSTANTS.getEnvelopeURI()); - soapConstants = soapConsts; + (soapConsts != null) ? soapConsts.getEnvelopeURI() : Constants.DEFAULT_SOAP_VERSION.getEnvelopeURI()); + soapConstants = (soapConsts != null) ? soapConsts : Constants.DEFAULT_SOAP_VERSION; try { setParentElement(env); setEnvelope(env); @@ -109,7 +109,7 @@ Attributes attributes, DeserializationContext context, SOAPConstants soapConsts) throws AxisFault { super(namespace, localPart, prefix, attributes, context); - soapConstants = soapConsts; + soapConstants = (soapConsts != null) ? soapConsts : Constants.DEFAULT_SOAP_VERSION; } public void setParentElement(SOAPElement parent) throws SOAPException { 1.86 +13 -1 xml-axis/java/src/org/apache/axis/message/SOAPEnvelope.java Index: SOAPEnvelope.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPEnvelope.java,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- SOAPEnvelope.java 21 Jan 2003 17:01:13 -0000 1.85 +++ SOAPEnvelope.java 18 Mar 2003 18:36:02 -0000 1.86 @@ -127,6 +127,15 @@ SOAPConstants soapConstants, SchemaVersion schemaVersion) { + // FIX BUG http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18108 + super(Constants.ELEM_ENVELOPE, + Constants.NS_PREFIX_SOAP_ENV, + (soapConstants != null) ? soapConstants.getEnvelopeURI() : Constants.DEFAULT_SOAP_VERSION.getEnvelopeURI()); + + if (soapConstants == null) + soapConstants = Constants.DEFAULT_SOAP_VERSION; + // FIX BUG http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18108 + this.soapConstants = soapConstants; this.schemaVersion = schemaVersion; header = new SOAPHeader(this, soapConstants); @@ -149,7 +158,10 @@ public SOAPEnvelope(InputStream input) throws SAXException { InputSource is = new InputSource(input); - header = new SOAPHeader(this, soapConstants); // soapConstants = null! + // FIX BUG http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18108 + //header = new SOAPHeader(this, soapConstants); // soapConstants = null! + header = new SOAPHeader(this, Constants.DEFAULT_SOAP_VERSION); // soapConstants = null! + // FIX BUG http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18108 DeserializationContext dser = null ; AxisClient tmpEngine = new AxisClient(new NullProvider()); MessageContext msgContext = new MessageContext(tmpEngine);