[riftsaw-commits] riftsaw SVN: r1320 - branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler.
Author: objectiser
Date: 2011-03-16 10:08:17 -0400 (Wed, 16 Mar 2011)
New Revision: 1320
Modified:
branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
Log:
ODE-915/RIFTSAW-318: Had to revert the order change of variable/partner link compilation,
as this appears to introduce a class cast exception when deserializing an older process
instance. This however may mean that variable initialization based on a partner link will
not work, but this type of initialization is less likely, so better to atleast have the
mechanism in some form of working order.
Modified:
branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
===================================================================
---
branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java 2011-03-15
14:56:00 UTC (rev 1319)
+++
branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java 2011-03-16
14:08:17 UTC (rev 1320)
@@ -1171,6 +1171,14 @@
try {
compile(oscope, src, new Runnable() {
public void run() {
+ for (Variable var : src.getVariables()) {
+ try {
+ compile(var);
+ } catch (CompilationException ce) {
+ recoveredFromError(var, ce);
+ }
+ }
+
for (CorrelationSet cset : src.getCorrelationSetDecls()) {
try {
compile(cset);
@@ -1187,15 +1195,6 @@
}
}
- // Changed order in case variable initialization based on partner
link
- for (Variable var : src.getVariables()) {
- try {
- compile(var);
- } catch (CompilationException ce) {
- recoveredFromError(var, ce);
- }
- }
-
if (!src.getEvents().isEmpty() || !src.getAlarms().isEmpty()) {
oscope.eventHandler = new OEventHandler(_oprocess);
oscope.eventHandler.debugInfo = createDebugInfo(src, "Event
Handler for " + src);