Author: alex.guizar(a)jboss.com
Date: 2009-03-24 19:19:15 -0400 (Tue, 24 Mar 2009)
New Revision: 4321
Modified:
jbpm3/branches/jbpm-3.2.5.SP4_JBPM-2121/modules/core/src/main/java/org/jbpm/graph/node/Join.java
jbpm3/branches/jbpm-3.2.5.SP4_JBPM-2121/modules/core/src/main/resources/org/jbpm/graph/node/Join.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP4_JBPM-2121/modules/core/src/test/java/org/jbpm/graph/node/JoinDbTest.java
Log:
JBPM-2121: revert addition of PARENTLOCKMODE_ column
Modified:
jbpm3/branches/jbpm-3.2.5.SP4_JBPM-2121/modules/core/src/main/java/org/jbpm/graph/node/Join.java
===================================================================
---
jbpm3/branches/jbpm-3.2.5.SP4_JBPM-2121/modules/core/src/main/java/org/jbpm/graph/node/Join.java 2009-03-24
18:31:57 UTC (rev 4320)
+++
jbpm3/branches/jbpm-3.2.5.SP4_JBPM-2121/modules/core/src/main/java/org/jbpm/graph/node/Join.java 2009-03-24
23:19:15 UTC (rev 4321)
@@ -42,13 +42,13 @@
private static final long serialVersionUID = 1L;
/**
- * specifies wether what type of hibernate lock should be acquired.
+ * specifies what type of hibernate lock should be acquired.
* null value defaults to LockMode.UPGRADE
*/
String parentLockMode;
/**
- * specifies if this joinhandler is a discriminator.
+ * specifies if this join is a discriminator.
* a descriminator reactivates the parent when the first
* concurrent token enters the join.
*/
Modified:
jbpm3/branches/jbpm-3.2.5.SP4_JBPM-2121/modules/core/src/main/resources/org/jbpm/graph/node/Join.hbm.xml
===================================================================
---
jbpm3/branches/jbpm-3.2.5.SP4_JBPM-2121/modules/core/src/main/resources/org/jbpm/graph/node/Join.hbm.xml 2009-03-24
18:31:57 UTC (rev 4320)
+++
jbpm3/branches/jbpm-3.2.5.SP4_JBPM-2121/modules/core/src/main/resources/org/jbpm/graph/node/Join.hbm.xml 2009-03-24
23:19:15 UTC (rev 4321)
@@ -6,8 +6,6 @@
<hibernate-mapping auto-import="false" default-access="field"
>
<subclass name="org.jbpm.graph.node.Join"
discriminator-value="J"
- extends="org.jbpm.graph.def.Node">
- <property name="parentLockMode" column="PARENTLOCKMODE_"/>
- </subclass>
+ extends="org.jbpm.graph.def.Node" />
</hibernate-mapping>
Modified:
jbpm3/branches/jbpm-3.2.5.SP4_JBPM-2121/modules/core/src/test/java/org/jbpm/graph/node/JoinDbTest.java
===================================================================
---
jbpm3/branches/jbpm-3.2.5.SP4_JBPM-2121/modules/core/src/test/java/org/jbpm/graph/node/JoinDbTest.java 2009-03-24
18:31:57 UTC (rev 4320)
+++
jbpm3/branches/jbpm-3.2.5.SP4_JBPM-2121/modules/core/src/test/java/org/jbpm/graph/node/JoinDbTest.java 2009-03-24
23:19:15 UTC (rev 4321)
@@ -21,7 +21,6 @@
*/
package org.jbpm.graph.node;
-import org.hibernate.LockMode;
import org.jbpm.db.AbstractDbTestCase;
import org.jbpm.graph.def.ProcessDefinition;
@@ -44,17 +43,16 @@
try {
processDefinition = graphSession.findLatestProcessDefinition(getName());
+ // JBPM-2112 revert addition of PARENTLOCKMODE_ column
Join join = (Join) processDefinition.getNode("read");
- assertEquals(LockMode.READ.toString(), join.getParentLockMode());
+ assertNull(join.getParentLockMode());
join = (Join) processDefinition.getNode("nowait");
- assertEquals(LockMode.UPGRADE_NOWAIT.toString(), join.getParentLockMode());
+ assertNull(join.getParentLockMode());
join = (Join) processDefinition.getNode("upgrade");
- assertEquals(LockMode.UPGRADE.toString(), join.getParentLockMode());
+ assertNull(join.getParentLockMode());
} finally {
- newTransaction();
graphSession.deleteProcessDefinition(processDefinitionId);
}
-
}
}
Show replies by date