[tomee] branch master updated: Make sure we don't return expired or canceled timers

[jlmonteiro]

This is an automated email from the ASF dual-hosted git repository.

jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/master by this push:
     new 9bbc7677 Make sure we don't return expired or canceled timers
9bbc7677 is described below

commit 9bbc7677cecb2caf0cddafdf9f0a2dd6b1bbcc9e
Author: Jean-Louis Monteiro <jlmonte...@tomitribe.com>
AuthorDate: Fri Apr 16 23:44:29 2021 +0200

    Make sure we don't return expired or canceled timers
---
 .../java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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 @@ public class EjbTimerServiceImpl implements 
EjbTimerService, Serializable {
 
         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;
     }