You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/11/07 01:33:25 UTC

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

Author: rmannibucau
Date: Wed Nov  7 00:33:25 2012
New Revision: 1406411

URL: http://svn.apache.org/viewvc?rev=1406411&view=rev
Log:
OPENEJB-1930 don't filter too much looking for a timeout method - can still be enhanced a bit

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

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerData.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerData.java?rev=1406411&r1=1406410&r2=1406411&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerData.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerData.java Wed Nov  7 00:33:25 2012
@@ -138,12 +138,14 @@ public abstract class TimerData implemen
         final BeanContext beanContext = SystemInstance.get().getComponent(ContainerSystem.class).getBeanContext(deploymentId);
         for (Iterator<Map.Entry<Method, MethodContext>> it = beanContext.iteratorMethodContext(); it.hasNext(); ) {
             final MethodContext methodContext = it.next().getValue();
+            /* this doesn't work in all cases
             if (methodContext.getSchedules().isEmpty()) {
                 continue;
             }
+            */
 
             final Method method = methodContext.getBeanMethod();
-            if (method.getName().equals(mtd)) {
+            if (method != null && method.getName().equals(mtd)) { // maybe we should check parameters too
                 timeoutMethod = method;
                 break;
             }