Author: mriou
Date: Thu Apr 3 09:21:20 2008
New Revision: 644392
URL: http://svn.apache.org/viewvc?rev=644392&view=rev
Log:
ODE-260 One more corner case: service returning an empty body.
Modified:
ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ExternalService.java
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
Modified:
ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ExternalService.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ExternalService.java?rev=644392&r1=644391&r2=644392&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ExternalService.java
(original)
+++
ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ExternalService.java
Thu Apr 3 09:21:20 2008
@@ -325,7 +325,8 @@
} else {
Message response =
odeMex.createMessage(odeMex.getOperation().getOutput().getMessage().getQName());
_converter.parseSoapResponse(response,
reply.getEnvelope(), operation);
- if (__log.isInfoEnabled())
__log.info("Response:\n" + DOMUtils.domToString(response.getMessage()));
+ if (__log.isInfoEnabled())
__log.info("Response:\n" + (response.getMessage() != null ?
+
DOMUtils.domToString(response.getMessage()) : "empty"));
odeMex.reply(response);
}
} catch (Exception ex) {
Modified:
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java?rev=644392&r1=644391&r2=644392&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
(original)
+++
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
Thu Apr 3 09:21:20 2008
@@ -1152,6 +1152,11 @@
// Merging header data, it's all stored in the same variable
Element data = msg.getData();
if (msg.getHeader() != null) {
+ if (data == null) {
+ Document doc = DOMUtils.newDocument();
+ data = doc.createElement("message");
+ doc.appendChild(data);
+ }
NodeList headerParts = msg.getHeader().getChildNodes();
for (int m = 0; m < headerParts.getLength(); m++) {
if (headerParts.item(m).getNodeType() == Node.ELEMENT_NODE) {
