From adeb08d0c04d220b12c0354d030d923ba272af38 Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Mon, 8 Oct 2012 12:06:00 +0000 Subject: [PATCH] ALF-16235: 4.2.a hanging on shutdown - Logic error in JBPMScheduler causing NPE early on in shutdown and preventing completion of other shutdown tasks git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42422 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/repo/workflow/jbpm/JBPMScheduler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/workflow/jbpm/JBPMScheduler.java b/source/java/org/alfresco/repo/workflow/jbpm/JBPMScheduler.java index 572f553e7a..53e009ed37 100644 --- a/source/java/org/alfresco/repo/workflow/jbpm/JBPMScheduler.java +++ b/source/java/org/alfresco/repo/workflow/jbpm/JBPMScheduler.java @@ -66,7 +66,7 @@ public class JBPMScheduler extends AbstractLifecycleBean @Override protected void onShutdown(ApplicationEvent event) { - if(JbpmEngineEnabled || executor.isStarted()) + if(JbpmEngineEnabled && executor.isStarted()) { executor.stop(); }