commit 9bbc7677cecb2caf0cddafdf9f0a2dd6b1bbcc9e
author Jean-Louis Monteiro <jlmonteiro@tomitribe.com> Fri Apr 16 23:44:29 2021 +0200
committer Jean-Louis Monteiro <jlmonteiro@tomitribe.com> Fri Apr 16 23:44:29 2021 +0200
tree 7cab87471514a6df28c7db7f23c62c09ab03093c
parent 0a6411fa783487594158cc5eb5462b028fda64ea

Make sure we don't return expired or canceled timers

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

diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java
index effee7c..f676121 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java
@@ -583,9 +583,11 @@
 
         final Collection<Timer> timers = new ArrayList<>();
         for (final TimerData timerData : timerStore.getTimers((String) deployment.getDeploymentID())) {
-            // if (!CalendarTimerData.class.isInstance(timerData) || !CalendarTimerData.class.cast(timerData).isAutoCreated()) {
-                timers.add(timerData.getTimer());
-            // }
+            // Returns all active timers associated with this bean.
+            if (timerData.isCancelled() || timerData.isExpired() || timerData.isStopped()) {
+                continue;
+            }
+            timers.add(timerData.getTimer());
         }
         return timers;
     }