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

[dblevins]

Author: dblevins
Date: Sun Aug 19 23:39:47 2012
New Revision: 1374879

URL: http://svn.apache.org/viewvc?rev=1374879&view=rev
Log:
removed ConcurrentHashMap of Schedulers, not needed.  BeanContext is already 
setup to track objects that need to be linked on a per-bean basis.

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=1374879&r1=1374878&r2=1374879&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
 Sun Aug 19 23:39:47 2012
@@ -55,9 +55,7 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
-import java.util.Map;
 import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
 
 
 public class EjbTimerServiceImpl implements EjbTimerService, Serializable {
@@ -69,8 +67,6 @@ public class EjbTimerServiceImpl impleme
     public static final String OPENEJB_TIMEOUT_JOB_NAME = 
"OPENEJB_TIMEOUT_JOB";
     public static final String OPENEJB_TIMEOUT_JOB_GROUP_NAME = 
"OPENEJB_TIMEOUT_GROUP";
 
-    private static final Map<Object, Scheduler> SCHEDULER_BY_BEANCONTEXT = new 
ConcurrentHashMap<Object, Scheduler>();
-
     private boolean transacted;
     private int retryAttempts;
 
@@ -115,7 +111,7 @@ public class EjbTimerServiceImpl impleme
     }
 
     public static synchronized Scheduler getDefaultScheduler(BeanContext 
deployment) {
-        Scheduler scheduler = 
SCHEDULER_BY_BEANCONTEXT.get(deployment.getDeploymentID());
+        Scheduler scheduler = deployment.get(Scheduler.class);
         boolean valid;
         try {
             valid = !scheduler.isShutdown();
@@ -173,7 +169,7 @@ public class EjbTimerServiceImpl impleme
             thisScheduler = scheduler;
         }
 
-        SCHEDULER_BY_BEANCONTEXT.put(deployment.getDeploymentID(), 
thisScheduler);
+        deployment.set(Scheduler.class, thisScheduler);
 
         return thisScheduler;
     }
@@ -207,7 +203,6 @@ public class EjbTimerServiceImpl impleme
                 throw new OpenEJBRuntimeException("Unable to shutdown 
scheduler", e);
             }
         }
-        SCHEDULER_BY_BEANCONTEXT.remove(deployment.getDeploymentID());
     }
 
     public static void shutdown() {