svn commit: r1371963 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java

[rmannibucau]

Author: rmannibucau
Date: Sat Aug 11 14:44:20 2012
New Revision: 1371963

URL: http://svn.apache.org/viewvc?rev=1371963&view=rev
Log:
using the right key to cleanup the map

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java?rev=1371963&r1=1371962&r2=1371963&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java
 Sat Aug 11 14:44:20 2012
@@ -114,7 +114,13 @@ public class EjbTimerServiceImpl impleme
 
     public static synchronized Scheduler getDefaultScheduler(BeanContext 
deployment) {
         Scheduler scheduler = 
SCHEDULER_BY_BEANCONTEXT.get(deployment.getDeploymentID());
-        if (scheduler != null) {
+        boolean valid;
+        try {
+            valid = !scheduler.isShutdown();
+        } catch (Exception ignored) {
+            valid = false;
+        }
+        if (scheduler != null && valid) {
             return scheduler;
         }
 
@@ -199,7 +205,7 @@ public class EjbTimerServiceImpl impleme
                 throw new OpenEJBRuntimeException("Unable to shutdown 
scheduler", e);
             }
         }
-        SCHEDULER_BY_BEANCONTEXT.remove(deployment);
+        SCHEDULER_BY_BEANCONTEXT.remove(deployment.getDeploymentID());
     }
 
     public static void shutdown() {