svn commit: r1097312 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerImpl.java

[xu...@apache.org]

Author: xuhaihong
Date: Thu Apr 28 03:12:45 2011
New Revision: 1097312

URL: http://svn.apache.org/viewvc?rev=1097312&view=rev
Log:
OPENEJB-1533 Use context bean context for state chceking (Patch from Han Hong Fang)

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

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerImpl.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerImpl.java?rev=1097312&r1=1097311&r2=1097312&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerImpl.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerImpl.java Thu Apr 28 03:12:45 2011
@@ -16,18 +16,19 @@
  */
 package org.apache.openejb.core.timer;
 
+import java.io.Serializable;
+import java.util.Date;
+
 import javax.ejb.EJBContext;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
+import javax.ejb.EJBException;
 import javax.ejb.NoSuchObjectLocalException;
 import javax.ejb.ScheduleExpression;
-import javax.ejb.EJBException;
-
-import java.io.Serializable;
-import java.util.Date;
+import javax.ejb.Timer;
+import javax.ejb.TimerHandle;
 
 import org.apache.openejb.BeanContext;
 import org.apache.openejb.core.BaseContext;
+import org.apache.openejb.core.ThreadContext;
 
 public class TimerImpl implements Timer {
     private final TimerData timerData;
@@ -85,8 +86,8 @@ public class TimerImpl implements Timer 
      * Insure that timer methods can be invoked for the current operation on this Context.
      */
     private void checkState() throws IllegalStateException, NoSuchObjectLocalException {
-        final BeanContext deployment = timerData.timerService.deployment;
-        final BaseContext context = (BaseContext) deployment.get(EJBContext.class);
+        final BeanContext beanContext = ThreadContext.getThreadContext().getBeanContext();
+        final BaseContext context = (BaseContext) beanContext.get(EJBContext.class);
         context.check(BaseContext.Call.timerMethod);
 
         if (timerData.isCancelled()) {