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 2009/01/14 02:05:21 UTC
svn commit: r734291 - in /ode/sandbox/simpel/src:
main/java/org/apache/ode/simpel/omodel/OBuilder.java
test/resources/loan-approval.simpel
Author: mriou
Date: Tue Jan 13 17:05:21 2009
New Revision: 734291
URL: http://svn.apache.org/viewvc?rev=734291&view=rev
Log:
A few bug fixes to have all tests back on track.
Modified:
ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/omodel/OBuilder.java
ode/sandbox/simpel/src/test/resources/loan-approval.simpel
Modified: ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/omodel/OBuilder.java
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/omodel/OBuilder.java?rev=734291&r1=734290&r2=734291&view=diff
==============================================================================
--- ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/omodel/OBuilder.java (original)
+++ ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/omodel/OBuilder.java Tue Jan 13 17:05:21 2009
@@ -324,6 +324,9 @@
__log.warn("Can't set block parameter with block parent activity " + blockActivity);
return;
}
+ // TODO block params for on** activities in scopes
+ if (blockActivity.getParent() instanceof OScope) return;
+
List<OActivity> parentList = ((OSequence)blockActivity.getParent()).sequence;
OActivity oact = parentList.get(parentList.indexOf(blockActivity) - 1);
if (oact instanceof OPickReceive) {
Modified: ode/sandbox/simpel/src/test/resources/loan-approval.simpel
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/src/test/resources/loan-approval.simpel?rev=734291&r1=734290&r2=734291&view=diff
==============================================================================
--- ode/sandbox/simpel/src/test/resources/loan-approval.simpel (original)
+++ ode/sandbox/simpel/src/test/resources/loan-approval.simpel Tue Jan 13 17:05:21 2009
@@ -6,9 +6,9 @@
partnerLink customer, assessor, approver;
try {
parallel {
- request = receive(customer, request);
- signal(receive-to-assess, [$request.amount < 10000]);
- signal(receive-to-approval, [$request.amount >= 10000]);
+ req = receive(customer, req);
+ signal(receive-to-assess, [$req.amount < 10000]);
+ signal(receive-to-approval, [$req.amount >= 10000]);
} and {
join(receive-to-assess);
invoke(assessor, check) { |risk|
@@ -25,9 +25,9 @@
signal(approval-to-reply);
} and {
join(approval-to-reply, setMessage-to-reply);
- reply(customer, request, approval);
+ reply(customer, req, approval);
}
} catch(lns::loanProcessFault) { |error|
- reply(customer, request, error);
+ reply(customer, req, error);
}
}