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

[mriou]

Author: mriou
Date: Tue May  6 08:30:08 2008
New Revision: 653811

URL: http://svn.apache.org/viewvc?rev=653811&view=rev
Log:
Better resiliency for findRoute.

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

Modified: 
ode/branches/APACHE_ODE_1.1/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java?rev=653811&r1=653810&r2=653811&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.1/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.1/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java
 Tue May  6 08:30:08 2008
@@ -125,17 +125,16 @@
             q.setLockMode("hs", LockMode.UPGRADE);
 
             HCorrelatorSelector selector;
-//            try {
+            try {
                 selector = (HCorrelatorSelector) q.uniqueResult();
-//            } catch (Exception ex) {
-//                __log.debug("Strange, could not get a unique result for 
findRoute, trying to iterate instead.");
-//
-//                Iterator i = q.iterate();
-//                if (i.hasNext())
-//                    selector = (HCorrelatorSelector) i.next();
-//                else selector = null;
-//                Hibernate.close(i);
-//            }
+            } catch (Exception ex) {
+                __log.debug("Strange, could not get a unique result for 
findRoute, trying to iterate instead.");
+
+                Iterator i = q.iterate();
+                if (i.hasNext()) selector = (HCorrelatorSelector) i.next();
+                else selector = null;
+                Hibernate.close(i);
+            }
     
             __log.debug(hdr + "found " + selector);
             return selector == null ? null : new MessageRouteDaoImpl(_sm, 
selector);