diff --git a/modules/activiti-spring/src/main/java/org/activiti/spring/ProcessEngineFactoryBean.java b/modules/activiti-spring/src/main/java/org/activiti/spring/ProcessEngineFactoryBean.java index 18d1d30f6693367493daa2887dac775e5dea01cb..9ebd1ddea607f3e70e7f39d88d19388d657c6ed8 100644 --- a/modules/activiti-spring/src/main/java/org/activiti/spring/ProcessEngineFactoryBean.java +++ b/modules/activiti-spring/src/main/java/org/activiti/spring/ProcessEngineFactoryBean.java @@ -68,7 +68,6 @@ public class ProcessEngineFactoryBean implements FactoryBean, Dis public void destroy() throws Exception { if (processEngine != null) { - ProcessEngines.getProcessEngines().remove(processEngine.getName()); processEngine.close(); } } @@ -83,7 +82,6 @@ public class ProcessEngineFactoryBean implements FactoryBean, Dis initializeJPA(); processEngine = (ProcessEngineImpl) processEngineConfiguration.buildProcessEngine(); - ProcessEngines.getProcessEngines().put(processEngine.getName(), processEngine); if (deploymentResources.length > 0) { autoDeployResources(); @@ -114,9 +112,7 @@ public class ProcessEngineFactoryBean implements FactoryBean, Dis } protected void initializeExpressionManager() { - if (applicationContext != null) { - processEngineConfiguration.setExpressionManager(new SpringExpressionManager(applicationContext)); - } + processEngineConfiguration.setExpressionManager(new SpringExpressionManager(applicationContext)); } private void initializeJPA() {