[jbpm-commits] JBoss JBPM SVN: r5665 - in jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm: svc/save and 1 other directory.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-09-21 11:59:45 -0400 (Mon, 21 Sep 2009)
New Revision: 5665

Modified:
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/logging/log/ProcessLog.java
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/svc/save/SaveLogsOperation.java
Log:
SOA-1476 moved setting of log index from domain model to save operation.  that way the token will not be updated if no logging service is configured

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/logging/log/ProcessLog.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/logging/log/ProcessLog.java	2009-09-21 07:40:38 UTC (rev 5664)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/logging/log/ProcessLog.java	2009-09-21 15:59:45 UTC (rev 5665)
@@ -55,7 +55,6 @@
   
   public void setToken(Token token) {
     this.token = token;
-    this.index = token.nextLogIndex();
   }
 
   public void setParent(CompositeLog parent) {

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/svc/save/SaveLogsOperation.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/svc/save/SaveLogsOperation.java	2009-09-21 07:40:38 UTC (rev 5664)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/svc/save/SaveLogsOperation.java	2009-09-21 15:59:45 UTC (rev 5665)
@@ -27,6 +27,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.jbpm.JbpmContext;
 import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.graph.exe.Token;
 import org.jbpm.logging.LoggingService;
 import org.jbpm.logging.exe.LoggingInstance;
 import org.jbpm.logging.log.ProcessLog;
@@ -44,6 +45,11 @@
       Iterator iter = loggingInstance.getLogs().iterator();
       while (iter.hasNext()) {
         ProcessLog processLog = (ProcessLog) iter.next();
+        Token token = processLog.getToken();
+        if (token!=null) {
+          int index = token.nextLogIndex();
+          processLog.setIndex(index);
+        }
         loggingService.log(processLog);
       }