[jbpm-commits] JBoss JBPM SVN: r3746 - in jbpm3/branches/jbpm-3.2.5.SP/modules/core: src/main/java/org/jbpm/graph/node and 1 other directory.
Author: thomas.diesler(a)jboss.com
Date: 2009-02-03 05:17:31 -0500 (Tue, 03 Feb 2009)
New Revision: 3746
Modified:
jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/graph/node/Join.java
Log:
[JBPM-1991] change default parentLockMode from FORCE to UPGRADE
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml 2009-02-03 10:12:31 UTC (rev 3745)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml 2009-02-03 10:17:31 UTC (rev 3746)
@@ -306,8 +306,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
- <!-- [JBPM-1782] Fix JoinExecutionDbTest on postgresql -->
-
<exclude>org/jbpm/jpdl/exe/JoinExecutionDbTest.java</exclude>
<!-- [JBPM-1810] Fix clean, drop, create schema with JbpmSchema
-->
<exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude>
</excludes>
Modified:
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/graph/node/Join.java
===================================================================
---
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/graph/node/Join.java 2009-02-03
10:12:31 UTC (rev 3745)
+++
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/graph/node/Join.java 2009-02-03
10:17:31 UTC (rev 3746)
@@ -43,7 +43,7 @@
/**
* specifies wether what type of hibernate lock should be acquired.
- * null value defaults to LockMode.FORCE
+ * null value defaults to LockMode.UPGRADE
*/
String parentLockMode;
@@ -120,8 +120,9 @@
JbpmContext jbpmContext = executionContext.getJbpmContext();
Session session = (jbpmContext!=null ? jbpmContext.getSession() : null);
if (session!=null) {
- // force version increment by default (LockMode.FORCE)
- LockMode lockMode = parentLockMode != null ? LockMode.parse(parentLockMode) :
LockMode.FORCE;
+ // obtain update lock by default (LockMode.UPGRADE)
+ LockMode lockMode = parentLockMode != null ? LockMode.parse(parentLockMode)
+ : LockMode.UPGRADE;
log.debug("acquiring " + lockMode + " lock on " +
parentToken);
// lock updates as appropriate, no need to flush here
session.lock(parentToken, lockMode);