5:59 a.m.
Author: jeff.yuchang
Date: 2011-10-18 23:59:21 -0400 (Tue, 18 Oct 2011)
New Revision: 1464
Modified:
branches/ODE/RiftSaw-ODE-trunk/agents/pom.xml
branches/ODE/RiftSaw-ODE-trunk/axis2-war/pom.xml
branches/ODE/RiftSaw-ODE-trunk/axis2/pom.xml
branches/ODE/RiftSaw-ODE-trunk/bpel-api-jca/pom.xml
branches/ODE/RiftSaw-ODE-trunk/bpel-api/pom.xml
branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/pom.xml
branches/ODE/RiftSaw-ODE-trunk/bpel-connector/pom.xml
branches/ODE/RiftSaw-ODE-trunk/bpel-dao/pom.xml
branches/ODE/RiftSaw-ODE-trunk/bpel-epr/pom.xml
branches/ODE/RiftSaw-ODE-trunk/bpel-obj/pom.xml
branches/ODE/RiftSaw-ODE-trunk/bpel-ql/pom.xml
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/pom.xml
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
branches/ODE/RiftSaw-ODE-trunk/bpel-schemas/pom.xml
branches/ODE/RiftSaw-ODE-trunk/bpel-scripts/pom.xml
branches/ODE/RiftSaw-ODE-trunk/bpel-store/pom.xml
branches/ODE/RiftSaw-ODE-trunk/bpel-test/pom.xml
branches/ODE/RiftSaw-ODE-trunk/dao-hibernate-db/pom.xml
branches/ODE/RiftSaw-ODE-trunk/dao-hibernate/pom.xml
branches/ODE/RiftSaw-ODE-trunk/dao-jpa-db/pom.xml
branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/pom.xml
branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa-derby/pom.xml
branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa/pom.xml
branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml
branches/ODE/RiftSaw-ODE-trunk/distro/pom.xml
branches/ODE/RiftSaw-ODE-trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml
branches/ODE/RiftSaw-ODE-trunk/jacob/pom.xml
branches/ODE/RiftSaw-ODE-trunk/jbi-bundle/pom.xml
branches/ODE/RiftSaw-ODE-trunk/jbi-karaf/pom.xml
branches/ODE/RiftSaw-ODE-trunk/jbi/pom.xml
branches/ODE/RiftSaw-ODE-trunk/jca-ra/pom.xml
branches/ODE/RiftSaw-ODE-trunk/jca-server/pom.xml
branches/ODE/RiftSaw-ODE-trunk/pom.xml
branches/ODE/RiftSaw-ODE-trunk/scheduler-simple/pom.xml
branches/ODE/RiftSaw-ODE-trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java
branches/ODE/RiftSaw-ODE-trunk/tools/pom.xml
branches/ODE/RiftSaw-ODE-trunk/utils/pom.xml
Log:
* updated version to 2.4.0-SNAPSHOT.
*RIFTSAW-455, fixed the NPE, and remove the AcquireInstanceLock method.
Modified: branches/ODE/RiftSaw-ODE-trunk/agents/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/agents/pom.xml 2011-10-19 03:23:12 UTC (rev 1463)
+++ branches/ODE/RiftSaw-ODE-trunk/agents/pom.xml 2011-10-19 03:59:21 UTC (rev 1464)
@@ -28,6 +28,6 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
</project>
Modified: branches/ODE/RiftSaw-ODE-trunk/axis2/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/axis2/pom.xml 2011-10-19 03:23:12 UTC (rev 1463)
+++ branches/ODE/RiftSaw-ODE-trunk/axis2/pom.xml 2011-10-19 03:59:21 UTC (rev 1464)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<properties>
Modified: branches/ODE/RiftSaw-ODE-trunk/axis2-war/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/axis2-war/pom.xml 2011-10-19 03:23:12 UTC (rev 1463)
+++ branches/ODE/RiftSaw-ODE-trunk/axis2-war/pom.xml 2011-10-19 03:59:21 UTC (rev 1464)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<properties>
Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-api/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/bpel-api/pom.xml 2011-10-19 03:23:12 UTC (rev 1463)
+++ branches/ODE/RiftSaw-ODE-trunk/bpel-api/pom.xml 2011-10-19 03:59:21 UTC (rev 1464)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-api-jca/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/bpel-api-jca/pom.xml 2011-10-19 03:23:12 UTC (rev
1463)
+++ branches/ODE/RiftSaw-ODE-trunk/bpel-api-jca/pom.xml 2011-10-19 03:59:21 UTC (rev
1464)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/pom.xml 2011-10-19 03:23:12 UTC (rev
1463)
+++ branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/pom.xml 2011-10-19 03:59:21 UTC (rev
1464)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-connector/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/bpel-connector/pom.xml 2011-10-19 03:23:12 UTC (rev
1463)
+++ branches/ODE/RiftSaw-ODE-trunk/bpel-connector/pom.xml 2011-10-19 03:59:21 UTC (rev
1464)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-dao/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/bpel-dao/pom.xml 2011-10-19 03:23:12 UTC (rev 1463)
+++ branches/ODE/RiftSaw-ODE-trunk/bpel-dao/pom.xml 2011-10-19 03:59:21 UTC (rev 1464)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-epr/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/bpel-epr/pom.xml 2011-10-19 03:23:12 UTC (rev 1463)
+++ branches/ODE/RiftSaw-ODE-trunk/bpel-epr/pom.xml 2011-10-19 03:59:21 UTC (rev 1464)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-obj/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/bpel-obj/pom.xml 2011-10-19 03:23:12 UTC (rev 1463)
+++ branches/ODE/RiftSaw-ODE-trunk/bpel-obj/pom.xml 2011-10-19 03:59:21 UTC (rev 1464)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-ql/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/bpel-ql/pom.xml 2011-10-19 03:23:12 UTC (rev 1463)
+++ branches/ODE/RiftSaw-ODE-trunk/bpel-ql/pom.xml 2011-10-19 03:59:21 UTC (rev 1464)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/pom.xml 2011-10-19 03:23:12 UTC (rev
1463)
+++ branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/pom.xml 2011-10-19 03:59:21 UTC (rev
1464)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified:
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
===================================================================
---
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java 2011-10-19
03:23:12 UTC (rev 1463)
+++
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java 2011-10-19
03:59:21 UTC (rev 1464)
@@ -375,6 +375,7 @@
return process.getOProcess();
}
+ @Deprecated
public void acquireInstanceLock(final Long iid) {
// We lock the instance to prevent concurrent transactions and prevent
unnecessary rollbacks,
// Note that we don't want to wait too long here to get our lock, since we
are likely holding
@@ -402,8 +403,9 @@
if( __log.isTraceEnabled() ) __log.trace("[JOB] onScheduledJob " +
jobInfo + "" + we.getInstanceId());
- acquireInstanceLock(we.getInstanceId());
+ //acquireInstanceLock(we.getInstanceId());
+
// DONT PUT CODE HERE-need this method real tight in a try/catch block, we need
to handle
// all types of failure here, the scheduler is not going to know how to handle
our errors,
// ALSO we have to release the lock obtained above (IMPORTANT), lest the whole
system come
Modified:
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
===================================================================
---
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java 2011-10-19
03:23:12 UTC (rev 1463)
+++
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java 2011-10-19
03:59:21 UTC (rev 1464)
@@ -299,7 +299,7 @@
return true;
} else if (routing.messageRoute != null) {
// Found a route, hitting it
-
_engine.acquireInstanceLock(routing.messageRoute.getTargetInstance().getInstanceId());
+
//_engine.acquireInstanceLock(routing.messageRoute.getTargetInstance().getInstanceId());
target.invokeInstance(mex, routing);
return true;
}
Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-schemas/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/bpel-schemas/pom.xml 2011-10-19 03:23:12 UTC (rev
1463)
+++ branches/ODE/RiftSaw-ODE-trunk/bpel-schemas/pom.xml 2011-10-19 03:59:21 UTC (rev
1464)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-scripts/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/bpel-scripts/pom.xml 2011-10-19 03:23:12 UTC (rev
1463)
+++ branches/ODE/RiftSaw-ODE-trunk/bpel-scripts/pom.xml 2011-10-19 03:59:21 UTC (rev
1464)
@@ -27,6 +27,6 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
</project>
Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-store/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/bpel-store/pom.xml 2011-10-19 03:23:12 UTC (rev 1463)
+++ branches/ODE/RiftSaw-ODE-trunk/bpel-store/pom.xml 2011-10-19 03:59:21 UTC (rev 1464)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-test/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/bpel-test/pom.xml 2011-10-19 03:23:12 UTC (rev 1463)
+++ branches/ODE/RiftSaw-ODE-trunk/bpel-test/pom.xml 2011-10-19 03:59:21 UTC (rev 1464)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/RiftSaw-ODE-trunk/dao-hibernate/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/dao-hibernate/pom.xml 2011-10-19 03:23:12 UTC (rev
1463)
+++ branches/ODE/RiftSaw-ODE-trunk/dao-hibernate/pom.xml 2011-10-19 03:59:21 UTC (rev
1464)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/RiftSaw-ODE-trunk/dao-hibernate-db/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/dao-hibernate-db/pom.xml 2011-10-19 03:23:12 UTC (rev
1463)
+++ branches/ODE/RiftSaw-ODE-trunk/dao-hibernate-db/pom.xml 2011-10-19 03:59:21 UTC (rev
1464)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml 2011-10-19 03:23:12 UTC (rev 1463)
+++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml 2011-10-19 03:59:21 UTC (rev 1464)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-db/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/dao-jpa-db/pom.xml 2011-10-19 03:23:12 UTC (rev 1463)
+++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-db/pom.xml 2011-10-19 03:59:21 UTC (rev 1464)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/pom.xml 2011-10-19 03:23:12 UTC (rev
1463)
+++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/pom.xml 2011-10-19 03:59:21 UTC (rev
1464)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa/pom.xml 2011-10-19 03:23:12 UTC (rev
1463)
+++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa/pom.xml 2011-10-19 03:59:21 UTC (rev
1464)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa-derby/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa-derby/pom.xml 2011-10-19 03:23:12 UTC (rev
1463)
+++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa-derby/pom.xml 2011-10-19 03:59:21 UTC (rev
1464)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/RiftSaw-ODE-trunk/distro/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/distro/pom.xml 2011-10-19 03:23:12 UTC (rev 1463)
+++ branches/ODE/RiftSaw-ODE-trunk/distro/pom.xml 2011-10-19 03:59:21 UTC (rev 1464)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<properties>
Modified:
branches/ODE/RiftSaw-ODE-trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml
===================================================================
---
branches/ODE/RiftSaw-ODE-trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml 2011-10-19
03:23:12 UTC (rev 1463)
+++
branches/ODE/RiftSaw-ODE-trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml 2011-10-19
03:59:21 UTC (rev 1464)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.bpel.examples</groupId>
<artifactId>ping-pong-bundle</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<name>ODE :: examples :: Ping Pong OSGi </name>
<packaging>bundle</packaging>
Modified: branches/ODE/RiftSaw-ODE-trunk/jacob/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/jacob/pom.xml 2011-10-19 03:23:12 UTC (rev 1463)
+++ branches/ODE/RiftSaw-ODE-trunk/jacob/pom.xml 2011-10-19 03:59:21 UTC (rev 1464)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/RiftSaw-ODE-trunk/jbi/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/jbi/pom.xml 2011-10-19 03:23:12 UTC (rev 1463)
+++ branches/ODE/RiftSaw-ODE-trunk/jbi/pom.xml 2011-10-19 03:59:21 UTC (rev 1464)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<properties>
Modified: branches/ODE/RiftSaw-ODE-trunk/jbi-bundle/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/jbi-bundle/pom.xml 2011-10-19 03:23:12 UTC (rev 1463)
+++ branches/ODE/RiftSaw-ODE-trunk/jbi-bundle/pom.xml 2011-10-19 03:59:21 UTC (rev 1464)
@@ -32,7 +32,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<build>
Modified: branches/ODE/RiftSaw-ODE-trunk/jbi-karaf/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/jbi-karaf/pom.xml 2011-10-19 03:23:12 UTC (rev 1463)
+++ branches/ODE/RiftSaw-ODE-trunk/jbi-karaf/pom.xml 2011-10-19 03:59:21 UTC (rev 1464)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<artifactId>riftsaw-jbi-karaf</artifactId>
Modified: branches/ODE/RiftSaw-ODE-trunk/jca-ra/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/jca-ra/pom.xml 2011-10-19 03:23:12 UTC (rev 1463)
+++ branches/ODE/RiftSaw-ODE-trunk/jca-ra/pom.xml 2011-10-19 03:59:21 UTC (rev 1464)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/RiftSaw-ODE-trunk/jca-server/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/jca-server/pom.xml 2011-10-19 03:23:12 UTC (rev 1463)
+++ branches/ODE/RiftSaw-ODE-trunk/jca-server/pom.xml 2011-10-19 03:59:21 UTC (rev 1464)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/RiftSaw-ODE-trunk/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/pom.xml 2011-10-19 03:23:12 UTC (rev 1463)
+++ branches/ODE/RiftSaw-ODE-trunk/pom.xml 2011-10-19 03:59:21 UTC (rev 1464)
@@ -8,7 +8,7 @@
</description>
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<url>http://ode.apache.org</url>
<issueManagement>
<system>jira</system>
@@ -82,7 +82,7 @@
</prerequisites>
-->
<properties>
- <ode.version>2.3.1-SNAPSHOT</ode.version>
+ <ode.version>2.4.0-SNAPSHOT</ode.version>
<activation.version>1.1</activation.version>
<annogen.version>0.1.0</annogen.version>
<antlr.version>2.7.7</antlr.version>
Modified: branches/ODE/RiftSaw-ODE-trunk/scheduler-simple/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/scheduler-simple/pom.xml 2011-10-19 03:23:12 UTC (rev
1463)
+++ branches/ODE/RiftSaw-ODE-trunk/scheduler-simple/pom.xml 2011-10-19 03:59:21 UTC (rev
1464)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified:
branches/ODE/RiftSaw-ODE-trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java
===================================================================
---
branches/ODE/RiftSaw-ODE-trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java 2011-10-19
03:23:12 UTC (rev 1463)
+++
branches/ODE/RiftSaw-ODE-trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java 2011-10-19
03:59:21 UTC (rev 1464)
@@ -762,23 +762,25 @@
int delayedCount = 0;
boolean runningLate;
AbsoluteTimeDateFormat f = new AbsoluteTimeDateFormat();
- for (JobDAO j : jobs) {
- // jobs might have been enqueued by #addTodoOnCommit meanwhile
- if (_outstandingJobs.size() >= _todoLimit){
- if (__log.isDebugEnabled()) __log.debug("Max capacity reached:
"+_outstandingJobs.size()+" jobs dispacthed i.e. queued or being
executed");
- break;
- }
- runningLate = (j.getScheduledDate() <= delayedTime);
- if (runningLate) {
- delayedCount++;
- }
- if (__log.isDebugEnabled())
- __log.debug("todo.enqueue job from db: " +
j.getJobId().trim() + " for " + j.getScheduledDate() + "(" +
f.format(j.getScheduledDate())+") "+(runningLate?"
delayed=true":""));
- enqueue(j);
+ if (jobs != null && jobs.size() > 0) {
+ for (JobDAO j : jobs) {
+ // jobs might have been enqueued by #addTodoOnCommit meanwhile
+ if (_outstandingJobs.size() >= _todoLimit){
+ if (__log.isDebugEnabled()) __log.debug("Max capacity reached:
"+_outstandingJobs.size()+" jobs dispacthed i.e. queued or being
executed");
+ break;
+ }
+ runningLate = (j.getScheduledDate() <= delayedTime);
+ if (runningLate) {
+ delayedCount++;
+ }
+ if (__log.isDebugEnabled())
+ __log.debug("todo.enqueue job from db: " +
j.getJobId().trim() + " for " + j.getScheduledDate() + "(" +
f.format(j.getScheduledDate())+") "+(runningLate?"
delayed=true":""));
+ enqueue(j);
+ }
+ if (delayedCount > 0) {
+ __log.warn("Dispatching jobs with more than
"+(_warningDelay/60000)+" minutes delay. Either the server was down for some
time or the job load is greater than available capacity");
+ }
}
- if (delayedCount > 0) {
- __log.warn("Dispatching jobs with more than
"+(_warningDelay/60000)+" minutes delay. Either the server was down for some
time or the job load is greater than available capacity");
- }
// clear only if the batch succeeded
_processedSinceLastLoadTask.clear();
Modified: branches/ODE/RiftSaw-ODE-trunk/tools/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/tools/pom.xml 2011-10-19 03:23:12 UTC (rev 1463)
+++ branches/ODE/RiftSaw-ODE-trunk/tools/pom.xml 2011-10-19 03:59:21 UTC (rev 1464)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/RiftSaw-ODE-trunk/utils/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/utils/pom.xml 2011-10-19 03:23:12 UTC (rev 1463)
+++ branches/ODE/RiftSaw-ODE-trunk/utils/pom.xml 2011-10-19 03:59:21 UTC (rev 1464)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<dependencies>
4581
days inactive
4581
days old
riftsaw-commits@lists.jboss.org
0 comments
1 participants
participants (1)
-
riftsaw-commits＠lists.jboss.org