Author: rmannibucau Date: Mon Aug 5 14:00:24 2013 New Revision: 1510482 URL: http://svn.apache.org/r1510482 Log: TOMEE-1011 timerStore is designed as a singleton by ejb
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerService.java tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/NullEjbTimerServiceImpl.java Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerService.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerService.java?rev=1510482&r1=1510481&r2=1510482&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerService.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerService.java Mon Aug 5 14:00:24 2013 @@ -45,4 +45,6 @@ public interface EjbTimerService { void start() throws OpenEJBException; void stop(); + + TimerStore getTimerStore(); } Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java?rev=1510482&r1=1510481&r2=1510482&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java Mon Aug 5 14:00:24 2013 @@ -123,7 +123,7 @@ public class EjbTimerServiceImpl impleme deployment = SystemInstance.get().getComponent(ContainerSystem.class).getBeanContext(dId); transactionManager = getDefaultTransactionManager(); - timerStore = new MemoryTimerStore(transactionManager); // TODO: check it should be serialized or not + timerStore = deployment.getEjbTimerService().getTimerStore(); scheduler = (Scheduler) Proxy.newProxyInstance(deployment.getClassLoader(), new Class<?>[]{Scheduler.class}, new LazyScheduler(deployment)); } @@ -673,6 +673,7 @@ public class EjbTimerServiceImpl impleme } } + @Override public TimerStore getTimerStore() { return timerStore; } Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/NullEjbTimerServiceImpl.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/NullEjbTimerServiceImpl.java?rev=1510482&r1=1510481&r2=1510482&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/NullEjbTimerServiceImpl.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/NullEjbTimerServiceImpl.java Mon Aug 5 14:00:24 2013 @@ -78,4 +78,7 @@ public class NullEjbTimerServiceImpl imp public void stop() { } + public TimerStore getTimerStore() { + return null; + } }