You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by rr...@apache.org on 2010/04/14 00:19:23 UTC

svn commit: r933801 - in /ode/branches/APACHE_ODE_1.X: bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java bpel-test/src/test/resources/bpel/2.0/TestWait1/Wait1-2.0.bpel

Author: rr
Date: Tue Apr 13 22:19:22 2010
New Revision: 933801

URL: http://svn.apache.org/viewvc?rev=933801&view=rev
Log:
ODE-560: Job failed during WAIT for incorrect date (fix)

Modified:
    ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java
    ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestWait1/Wait1-2.0.bpel

Modified: ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java?rev=933801&r1=933800&r2=933801&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java Tue Apr 13 22:19:22 2010
@@ -57,7 +57,8 @@ class WAIT extends ACTIVITY {
         } catch (EvaluationException ee) {
             String msg = "Unexpected error evaluating wait condition.";
             __log.error(msg, ee);
-            throw new InvalidProcessException(msg,ee);
+            _self.parent.completed(createFault(_self.o.getOwner().constants.qnSubLanguageExecutionFault,  _self.o), CompensationHandler.emptySet());
+            return;
         }
 
 

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestWait1/Wait1-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestWait1/Wait1-2.0.bpel?rev=933801&r1=933800&r2=933801&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestWait1/Wait1-2.0.bpel (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestWait1/Wait1-2.0.bpel Tue Apr 13 22:19:22 2010
@@ -53,6 +53,17 @@
           <for>'PT5S'</for>
         </wait>
       	
+        <scope>
+            <faultHandlers>
+                <catchAll>
+                    <empty/>
+                </catchAll>
+            </faultHandlers>
+            <wait>
+              <for expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">xsd:double('')</for>
+            </wait>
+        </scope>
+
        <reply name="endReply" 
               operation="testOperation" 
               partnerLink="testPartnerLink"