[jbpm-commits] JBoss JBPM SVN: r5029 - jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-06-11 10:47:45 -0400 (Thu, 11 Jun 2009)
New Revision: 5029

Modified:
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java
Log:
JBPM-2330 fine tuned execution id generation

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java	2009-06-11 14:45:17 UTC (rev 5028)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java	2009-06-11 14:47:45 UTC (rev 5029)
@@ -47,12 +47,11 @@
     }
 
     String executionPart = null;
-    if (execution.getKey()!=null) {
+    if ( (parent==null)
+         && (execution.getKey()!=null)
+       ) {
       executionPart = execution.getKey();
     
-    } else if (execution.getName()!=null) {
-      executionPart = execution.getName();
-
     } else {
       Session session = Environment.getFromCurrent(Session.class);
       session.save(execution);
@@ -61,10 +60,6 @@
 
     String executionId = base+"."+executionPart;
     
-    if (parent!=null) {
-      executionId += "["+execution.getDbid()+"]";
-    }
-    
     if (log.isDebugEnabled()) log.debug("generated execution id "+executionId);
     
     return executionId;