[jbpm-commits] JBoss JBPM SVN: r3732 - in jbpm3/branches/jbpm-3.2.4.SP/modules/core: src/main/java/org/jbpm/graph/node and 1 other directory.
Author: alex.guizar(a)jboss.com
Date: 2009-01-29 23:58:08 -0500 (Thu, 29 Jan 2009)
New Revision: 3732
Modified:
jbpm3/branches/jbpm-3.2.4.SP/modules/core/pom.xml
jbpm3/branches/jbpm-3.2.4.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.4.SP/modules/core/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.4.SP/modules/core/pom.xml 2009-01-30 03:11:11 UTC (rev 3731)
+++ jbpm3/branches/jbpm-3.2.4.SP/modules/core/pom.xml 2009-01-30 04:58:08 UTC (rev 3732)
@@ -313,8 +313,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.4.SP/modules/core/src/main/java/org/jbpm/graph/node/Join.java
===================================================================
---
jbpm3/branches/jbpm-3.2.4.SP/modules/core/src/main/java/org/jbpm/graph/node/Join.java 2009-01-30
03:11:11 UTC (rev 3731)
+++
jbpm3/branches/jbpm-3.2.4.SP/modules/core/src/main/java/org/jbpm/graph/node/Join.java 2009-01-30
04:58:08 UTC (rev 3732)
@@ -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;
@@ -114,8 +114,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);