You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2007/05/24 01:03:22 UTC
svn commit: r541116 -
/incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
Author: mriou
Date: Wed May 23 16:03:21 2007
New Revision: 541116
URL: http://svn.apache.org/viewvc?view=rev&rev=541116
Log:
Few fixed tests, good karma earned by Tammo.
Modified:
incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
Modified: incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java?view=diff&rev=541116&r1=541115&r2=541116
==============================================================================
--- incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java (original)
+++ incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java Wed May 23 16:03:21 2007
@@ -537,9 +537,8 @@
if (isFailed())
return;
- Status finalstat;
try {
- finalstat = running.get(_invocation.maximumWaitMs, TimeUnit.MILLISECONDS);
+ running.get(_invocation.maximumWaitMs, TimeUnit.MILLISECONDS);
} catch (Exception ex) {
failure(_invocation, "Exception on future object.", ex);
return;
@@ -553,14 +552,15 @@
if (_invocation.maximumWaitMs <= itime)
failure(_invocation, "Response took too long.", _invocation.maximumWaitMs, itime);
- if (_invocation.expectedFinalStatus != null && !_invocation.expectedFinalStatus.equals(finalstat))
- failure(_invocation, "Unexpected final message exchange status", _invocation.expectedFinalStatus, finalstat);
-
if (isFailed())
return;
scheduler.begin();
try {
+ Status finalstat = mex.getStatus();
+ if (_invocation.expectedFinalStatus != null && !_invocation.expectedFinalStatus.equals(finalstat))
+ failure(_invocation, "Unexpected final message exchange status", _invocation.expectedFinalStatus, finalstat);
+
if (_invocation.expectedFinalCorrelationStatus != null
&& !_invocation.expectedFinalCorrelationStatus.equals(mex.getCorrelationStatus())) {
failure(_invocation, "Unexpected final correlation status", _invocation.expectedFinalCorrelationStatus, mex