svn commit: r736076 - /ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OPartnerLink.java

[seanahn]

Author: seanahn
Date: Tue Jan 20 11:36:49 2009
New Revision: 736076

URL: http://svn.apache.org/viewvc?rev=736076&view=rev
Log:
ODE-476, OPickReceive and OEventHandler do not properly migrate correlation data

Modified:
    
ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OPartnerLink.java

Modified: 
ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OPartnerLink.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OPartnerLink.java?rev=736076&r1=736075&r2=736076&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OPartnerLink.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OPartnerLink.java
 Tue Jan 20 11:36:49 2009
@@ -55,7 +55,7 @@
     private final HashMap<String,Set<OScope.CorrelationSet>> 
_nonIntitiatingCorrelationSets = new 
HashMap<String,Set<OScope.CorrelationSet>>();
 
     /** The set of joining CorrelationSets that may be used as a match 
criteria, organized by {...@link Operation} */
-    private final HashMap<String,Set<OScope.CorrelationSet>> 
_joiningCorrelationSets = new HashMap<String,Set<OScope.CorrelationSet>>();
+    private HashMap<String,Set<OScope.CorrelationSet>> _joiningCorrelationSets 
= new HashMap<String,Set<OScope.CorrelationSet>>();
 
     /** The set of {...@link Operation}s that can be used to create a process 
instance. */
     private final HashSet<String> _createInstanceOperations = new 
HashSet<String>();
@@ -102,6 +102,10 @@
                }
                ret.add(cset);
        } else {
+               // serialization backward compatibility; joiningCorrelationSets 
could be null if read from old definition
+               if( _joiningCorrelationSets == null ) {
+                       _joiningCorrelationSets = new 
HashMap<String,Set<OScope.CorrelationSet>>();
+               }
                Set<OScope.CorrelationSet> ret = 
_joiningCorrelationSets.get(operation.getName());
                if (ret == null) {
                    ret = new HashSet<OScope.CorrelationSet>();