svn commit: r799104 - /ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java

[seanahn]

Author: seanahn
Date: Wed Jul 29 22:31:37 2009
New Revision: 799104

URL: http://svn.apache.org/viewvc?rev=799104&view=rev
Log:
route_policy can become null when the process was compiled with older builds

Modified:
    
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java

Modified: 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java?rev=799104&r1=799103&r2=799104&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java
 Wed Jul 29 22:31:37 2009
@@ -117,15 +117,12 @@
         // Make sure we obtain a lock for the selector we want to find.
         q.setLockMode("hs", LockMode.UPGRADE);
 
-        HCorrelatorSelector selector;
-        List selectors;
         List<HProcessInstance> targets = new ArrayList<HProcessInstance>();
-        selectors = q.list();
-        for (Object selo : selectors) {
-            selector = (HCorrelatorSelector) selo;
+        for (HCorrelatorSelector selector : 
(List<HCorrelatorSelector>)q.list()) {
             if (selector != null) {
+                boolean isRoutePolicyOne = selector.getRoute() == null || 
"one".equals(selector.getRoute()); 
                 if ("all".equals(selector.getRoute()) ||
-                        ("one".equals(selector.getRoute()) && 
!targets.contains(selector.getInstance()))) {
+                        (isRoutePolicyOne && 
!targets.contains(selector.getInstance()))) {
                     routes.add(new MessageRouteDaoImpl(_sm, selector));
                     targets.add(selector.getInstance());
                 }