提交 c4d24661 编写于 作者: J jbarrez

Fix for history attribute on process element

上级 cfb81f5f
......@@ -19,6 +19,7 @@ import org.activiti.engine.impl.cfg.ProcessEngineConfiguration;
import org.activiti.engine.impl.pvm.delegate.ExecutionListener;
import org.activiti.engine.impl.pvm.delegate.TaskListener;
import org.activiti.engine.impl.pvm.process.ActivityImpl;
import org.activiti.engine.impl.pvm.process.ProcessDefinitionImpl;
import org.activiti.engine.impl.pvm.process.ScopeImpl;
import org.activiti.engine.impl.pvm.process.TransitionImpl;
import org.activiti.engine.impl.repository.ProcessDefinitionEntity;
......@@ -128,7 +129,14 @@ public class HistoryParseListener implements BpmnParseListener {
}
protected int determineHistoryLevel(ScopeImpl scopeElement) {
return Math.min(configurationhistoryLevel, ((ProcessDefinitionEntity) scopeElement.getProcessDefinition()).getHistoryLevel());
ProcessDefinitionImpl processDefinition = scopeElement.getProcessDefinition();
if (processDefinition != null) {
Integer processHistoryLevel = ((ProcessDefinitionEntity) processDefinition).getHistoryLevel();
if (processHistoryLevel != null) {
return Math.min(configurationhistoryLevel, ((ProcessDefinitionEntity) scopeElement.getProcessDefinition()).getHistoryLevel());
}
}
return configurationhistoryLevel;
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册