Author: bradsdavis Date: 2010-09-29 14:45:19 -0400 (Wed, 29 Sep 2010) New Revision: 6700 Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/context/exe/VariableContainer.java Log: Committed change the VariableContainer for logging service bug. Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/context/exe/VariableContainer.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/context/exe/VariableContainer.java 2010-09-28 22:08:09 UTC (rev 6699) +++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/context/exe/VariableContainer.java 2010-09-29 18:45:19 UTC (rev 6700) @@ -15,6 +15,7 @@ import org.jbpm.context.log.VariableDeleteLog; import org.jbpm.graph.exe.ProcessInstance; import org.jbpm.graph.exe.Token; +import org.jbpm.logging.db.DbLoggingService; public abstract class VariableContainer implements Serializable { @@ -198,12 +199,13 @@ variableInstance.removeReferences(); // is engine running in memory only or with logging enabled? JbpmContext jbpmContext = JbpmContext.getCurrentJbpmContext(); - if (jbpmContext == null || jbpmContext.getServices().getLoggingService() != null) { + if (jbpmContext == null || (jbpmContext.getServices().getLoggingService() !=null )) { // record variable deletion // do not actually delete variable instance because log refers to it getToken().addLog(new VariableDeleteLog(variableInstance)); } - else { + + if (jbpmContext != null && ((jbpmContext.getServices().getLoggingService() != null) && !(jbpmContext.getServices().getLoggingService() instanceof DbLoggingService))){ // delete variable instance here before all references to it are lost Session session = jbpmContext.getSession(); if (session != null) session.delete(variableInstance);