JBossWS SVN: r15205 - in stack/native/trunk/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws and 1 other directories.
3:28 a.m.
Author: alessio.soldano(a)jboss.com
Date: 2011-11-08 04:28:55 -0500 (Tue, 08 Nov 2011)
New Revision: 15205
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/JBWS3380TestCase.java
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
Log:
[JBWS-3380] Applying Kev's patch
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2011-11-07
14:12:18 UTC (rev 15204)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2011-11-08
09:28:55 UTC (rev 15205)
@@ -189,7 +189,7 @@
DOMUtils.copyAttributes(soapHeader, domHeader);
- if (!soapHeader.getPrefix().equals(domHeader.getPrefix()))
+ if (!checkEquals(soapHeader.getPrefix(), domHeader.getPrefix()))
{
soapHeader.setPrefix(domHeader.getPrefix());
}
@@ -234,7 +234,7 @@
DOMUtils.copyAttributes(soapBody, domBody);
- if (!soapBody.getPrefix().equals(domBody.getPrefix()))
+ if (!checkEquals(soapBody.getPrefix(), domBody.getPrefix()))
{
soapBody.setPrefix(domBody.getPrefix());
}
@@ -443,4 +443,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));
+ }
+ }
}
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/JBWS3380TestCase.java
===================================================================
---
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/JBWS3380TestCase.java
(rev 0)
+++
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/JBWS3380TestCase.java 2011-11-08
09:28:55 UTC (rev 15205)
@@ -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
4816
days inactive
4816
days old
jbossws-commits@lists.jboss.org
0 comments
1 participants
participants (1)
-
jbossws-commits＠lists.jboss.org