Author: bmaxwell Date: 2011-11-08 15:57:52 -0500 (Tue, 08 Nov 2011) New Revision: 15215 Added: stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/ stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/JBWS3380TestCase.java Removed: stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/JBWS3380TestCase.java Modified: stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/ stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/core/ stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/testsuite/native-tests/ Log: [JBPAPP-7499] One-off patch for JBPAPP-7498 - JBPAPP-5450 breaks with default namespace on SOAP Envelope Property changes on: stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499 ___________________________________________________________________ Modified: svn:mergeinfo - /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192 /stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946 /stack/native/trunk:12502,13992,14157,14160,14181,14183,14842 + /stack/native/branches/jbossws-native-3.1.2:15206 /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192 /stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946 /stack/native/trunk:12502,13992,14157,14160,14181,14183,14842 Property changes on: stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/core ___________________________________________________________________ Modified: svn:mergeinfo - /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192 /stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946 /stack/native/trunk/modules/core:12502,13992,14011,14157,14160,14181,14183,14842 + /stack/native/branches/jbossws-native-3.1.2/modules/core:15206 /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192 /stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946 /stack/native/trunk/modules/core:12502,13992,14011,14157,14160,14181,14183,14842 Modified: stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2011-11-08 19:48:02 UTC (rev 15214) +++ stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2011-11-08 20:57:52 UTC (rev 15215) @@ -185,7 +185,7 @@ DOMUtils.copyAttributes(soapHeader, domHeader); - if (!soapHeader.getPrefix().equals(domHeader.getPrefix())) + if (!checkEquals(soapHeader.getPrefix(), domHeader.getPrefix())) { soapHeader.setPrefix(domHeader.getPrefix()); } @@ -226,7 +226,7 @@ DOMUtils.copyAttributes(soapBody, domBody); - if (!soapBody.getPrefix().equals(domBody.getPrefix())) + if (!checkEquals(soapBody.getPrefix(), domBody.getPrefix())) { soapBody.setPrefix(domBody.getPrefix()); } @@ -435,4 +435,16 @@ String nodeValue = child.getNodeValue(); soapElement.addTextNode(nodeValue); } + + private boolean checkEquals(final String lhs, final String rhs) + { + if (lhs == null) + { + return (rhs == null); + } + else + { + return (lhs.equals(rhs)); + } + } } Property changes on: stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/testsuite/native-tests ___________________________________________________________________ Modified: svn:mergeinfo - /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192 /stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946 /stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14157,14160,14181,14183,14842 + /stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests:15206 /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192 /stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946 /stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14157,14160,14181,14183,14842 Deleted: stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/JBWS3380TestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/JBWS3380TestCase.java 2011-11-08 10:13:47 UTC (rev 15206) +++ stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/JBWS3380TestCase.java 2011-11-08 20:57:52 UTC (rev 15215) @@ -1,56 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws3380; - -import java.io.ByteArrayInputStream; -import java.io.IOException; - -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; - -import org.jboss.wsf.test.JBossWSTest; - -/** - * [JBWS-3380] NPE when dealing with default namespace on SOAP Envelope - * - * @author alessio.soldano(a)jboss.com - */ -public class JBWS3380TestCase extends JBossWSTest -{ - private final String requestMessage = "<Envelope xmlns=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:rep=\"http://jbws3380.jaxws.ws.test.jboss.org/\">" - + " <Header/>" - + " <Body>" - + " <rep:helloWorld>" - + " <!--Optional:-->" - + " <name>?</name>" - + " </rep:helloWorld>" - + " </Body>" - + "</Envelope>"; - - public void testParseRequestMessage() throws SOAPException, IOException - { - MessageFactory msgFactory = MessageFactory.newInstance(); - SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(requestMessage.getBytes())); - assertNotNull(reqMsg); - } -} \ No newline at end of file Copied: stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/JBWS3380TestCase.java (from rev 15206, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/JBWS3380TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/JBWS3380TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/JBWS3380TestCase.java 2011-11-08 20:57:52 UTC (rev 15215) @@ -0,0 +1,56 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3380; + +import java.io.ByteArrayInputStream; +import java.io.IOException; + +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; + +import org.jboss.wsf.test.JBossWSTest; + +/** + * [JBWS-3380] NPE when dealing with default namespace on SOAP Envelope + * + * @author alessio.soldano(a)jboss.com + */ +public class JBWS3380TestCase extends JBossWSTest +{ + private final String requestMessage = "<Envelope xmlns=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:rep=\"http://jbws3380.jaxws.ws.test.jboss.org/\">" + + " <Header/>" + + " <Body>" + + " <rep:helloWorld>" + + " <!--Optional:-->" + + " <name>?</name>" + + " </rep:helloWorld>" + + " </Body>" + + "</Envelope>"; + + public void testParseRequestMessage() throws SOAPException, IOException + { + MessageFactory msgFactory = MessageFactory.newInstance(); + SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(requestMessage.getBytes())); + assertNotNull(reqMsg); + } +} \ No newline at end of file