From f3d602dc2134388599081a6b9c07e09397b6bba6 Mon Sep 17 00:00:00 2001
From: gnt <gnt@51b7ce9a-3489-0410-86de-dc9a27cf12c7>
Date: Mon, 25 Oct 2010 12:29:40 +0000
Subject: [PATCH] Revert ACT-227

---
 .../java/org/activiti/spring/ProcessEngineFactoryBean.java  | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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 18d1d30f66..9ebd1ddea6 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<ProcessEngine>, 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<ProcessEngine>, 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<ProcessEngine>, Dis
   }
 
   protected void initializeExpressionManager() {
-    if (applicationContext != null) {
-      processEngineConfiguration.setExpressionManager(new SpringExpressionManager(applicationContext));
-    }
+    processEngineConfiguration.setExpressionManager(new SpringExpressionManager(applicationContext));
   }
   
   private void initializeJPA() {
-- 
GitLab