Author: veithen
Date: Sat Jul 28 08:50:15 2012
New Revision: 1366615
URL: http://svn.apache.org/viewvc?rev=1366615&view=rev
Log:
Fixed an issue in PayloadHelper#setXMLPayload that caused an error for SOAP
envelopes having a body that is not completely built.
Added:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/PayloadHelperTest.java
(with props)
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/PayloadHelper.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/PayloadHelper.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/PayloadHelper.java?rev=1366615&r1=1366614&r2=1366615&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/PayloadHelper.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/PayloadHelper.java
Sat Jul 28 08:50:15 2012
@@ -19,8 +19,6 @@
package org.apache.synapse.util;
-import java.util.Iterator;
-
import javax.activation.DataHandler;
import javax.xml.namespace.QName;
@@ -114,10 +112,7 @@ public class PayloadHelper {
envelope.addChild(body);
}
} else {
- for (Iterator it = body.getChildren(); it.hasNext();) {
- OMNode node = (OMNode) it.next();
- node.discard();
- }
+ body.removeChildren();
}
body.addChild(element);
}
Added:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/PayloadHelperTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/PayloadHelperTest.java?rev=1366615&view=auto
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/PayloadHelperTest.java
(added)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/PayloadHelperTest.java
Sat Jul 28 08:50:15 2012
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.synapse.util;
+
+import java.io.StringReader;
+
+import junit.framework.TestCase;
+
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFactory;
+
+public class PayloadHelperTest extends TestCase {
+ /**
+ * Tests {@link PayloadHelper#setXMLPayload(SOAPEnvelope, OMElement)} with
a SOAP envelope that
+ * has not been built completely.
+ */
+ public void testSetXMLPayloadWithIncompleteEnvelope() {
+ SOAPFactory factory = OMAbstractFactory.getSOAP11Factory();
+ SOAPEnvelope orgEnvelope = factory.getDefaultEnvelope();
+ OMNamespace ns = factory.createOMNamespace("urn:test", "p");
+ factory.createOMElement("test", ns,
orgEnvelope.getBody()).setText("test");
+ String message = orgEnvelope.toString();
+ SOAPEnvelope envelope = OMXMLBuilderFactory.createSOAPModelBuilder(
+ new StringReader(message)).getSOAPEnvelope();
+ OMElement newPayload = factory.createOMElement("test2", ns);
+ newPayload.setText("test2");
+ PayloadHelper.setXMLPayload(envelope, newPayload);
+ assertSame(newPayload, envelope.getBody().getFirstOMChild());
+ assertNull(newPayload.getNextOMSibling());
+ }
+}
Propchange:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/PayloadHelperTest.java
------------------------------------------------------------------------------
svn:eol-style = native
