svn commit: r629337 - in /ode/branches/APACHE_ODE_1.1: bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java

[mriou]

Author: mriou
Date: Tue Feb 19 19:47:10 2008
New Revision: 629337

URL: http://svn.apache.org/viewvc?rev=629337&view=rev
Log:
Small fix on wait that was messing the channels badly under a small condition.

Modified:
    
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java
    
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java

Modified: 
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java?rev=629337&r1=629336&r2=629337&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java
 Tue Feb 19 19:47:10 2008
@@ -94,7 +94,7 @@
                 }
             }));
         }else{
-            _self.parent.completed(null, null);
+            _self.parent.completed(null, CompensationHandler.emptySet());
         }
     }
 

Modified: 
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java?rev=629337&r1=629336&r2=629337&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java
 Tue Feb 19 19:47:10 2008
@@ -89,6 +89,23 @@
     }
 
     /**
+     * Test the wait "until" syntax.
+     */
+       @Test public void testWaitUntilPast() throws Throwable {
+        deploy("/bpel/2.0/TestWaitUntil");
+        DateFormat idf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
+        String isountil = idf.format(new 
Date(System.currentTimeMillis()-5000));
+        Invocation inv = addInvoke("WaitUntil", new 
QName("http://ode/bpel/unit-test.wsdl";, "testService"), "testOperation",
+            "<message><TestPart/><Time>"+isountil+"</Time></message>",
+            null);
+        inv.maximumWaitMs=2*1000L;
+        inv.expectedStatus = MessageExchange.Status.ASYNC;
+        inv.expectedFinalStatus = MessageExchange.Status.RESPONSE;
+
+        go();
+    }
+
+    /**
      * Tests the wait "for" syntax.
      * @throws Throwable
      */