[riftsaw-commits] riftsaw SVN: r935 - in branches/RiftSaw-ODE-2.1.x: scheduler-simple/src/test/java/org/apache/ode/scheduler/simple and 1 other directory.
Author: jeff.yuchang
Date: 2010-09-07 02:21:42 -0400 (Tue, 07 Sep 2010)
New Revision: 935
Modified:
branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelatorDAOImpl.java
branches/RiftSaw-ODE-2.1.x/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java
Log:
* RIFTSAW-278, use instanceId to compare. Because correlatorDAO load the
processInstanceDAO in lazy-load way, so when compare these two object directly, it fails
in hibernate situation.
Modified:
branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelatorDAOImpl.java
===================================================================
---
branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelatorDAOImpl.java 2010-09-06
11:00:24 UTC (rev 934)
+++
branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelatorDAOImpl.java 2010-09-07
06:21:42 UTC (rev 935)
@@ -173,7 +173,7 @@
boolean flush = false;
for (Iterator<MessageRouteDAOImpl> itr = _routes.iterator();
itr.hasNext();) {
MessageRouteDAOImpl mr = itr.next();
- if (mr.getGroupId().equals(routeGroupId) &&
mr.getTargetInstance().equals(target)) {
+ if (mr.getGroupId().equals(routeGroupId) &&
mr.getTargetInstance().getInstanceId().equals(target.getInstanceId())) {
if (__log.isDebugEnabled()) {
__log.debug("removing " + mr.getCorrelationKey() + "
" + mr.getIndex() + " " + mr.getRoute());
}
Modified:
branches/RiftSaw-ODE-2.1.x/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java
===================================================================
---
branches/RiftSaw-ODE-2.1.x/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java 2010-09-06
11:00:24 UTC (rev 934)
+++
branches/RiftSaw-ODE-2.1.x/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java 2010-09-07
06:21:42 UTC (rev 935)
@@ -45,7 +45,7 @@
@Override
protected void initialize(TransactionManager txm) throws Exception {
- _ds = createGeronimoDataSource(txm, "jdbc:h2:mem:" + new
GUID().toString(), org.h2.Driver.class.getName(), "sa", "");
+ _ds = createGeronimoDataSource(txm, "jdbc:h2:mem:" + new GUID().toString()
+ ";DB_CLOSE_ON_EXIT=FALSE", org.h2.Driver.class.getName(), "sa",
"");
setup();
_del = new JdbcDelegate(_ds);
}