You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mi...@apache.org on 2009/04/15 02:51:33 UTC

svn commit: r765027 - /ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java

Author: midon
Date: Wed Apr 15 00:51:33 2009
New Revision: 765027

URL: http://svn.apache.org/viewvc?rev=765027&view=rev
Log:
ODE-578: a failure might not provide a message

Modified:
    ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java

Modified: ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java?rev=765027&r1=765026&r2=765027&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java Wed Apr 15 00:51:33 2009
@@ -1186,6 +1186,7 @@
     }
 
     private Element mergeHeaders(MessageDAO msg) {
+        if(msg==null) return null;
         // Merging header data, it's all stored in the same variable
         Element data = msg.getData();
         if (msg.getHeader() != null) {
@@ -1239,7 +1240,6 @@
         MessageExchange.Status status = MessageExchange.Status.valueOf(dao.getStatus());
         switch (status) {
             case FAULT:
-            case FAILURE:
             case RESPONSE:
                 response = dao.getResponse();
                 if (response == null) {
@@ -1249,6 +1249,9 @@
                     throw new BpelEngineException(msg);
                 }
                 break;
+            case FAILURE:
+                response = dao.getResponse();
+                break;
             default:
                 // We should not be in any other state when requesting this.
                 String msg = "Engine requested response while the message exchange " + mexId + " was in the state "