From 4e987d319ab0f78031b41d45cbdc71178a2eb47f Mon Sep 17 00:00:00 2001
From: Peter Donald <peter@realityforge.org>
Date: Wed, 17 Jul 2019 11:51:48 +1000
Subject: [PATCH] Ensure that the TimerWrapper references correct
 EJBTimerService

Non-persistent timers are incorrectly wrapped and thus will generate NoSuchObjectLocalException
exceptions when invoking methods such as Timer.getInfo() on returned timers.

Fixes #3884
---
 .../java/com/sun/ejb/containers/EJBTimerServiceWrapper.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerServiceWrapper.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerServiceWrapper.java
index 70836c13fa1..534f5e0dfcc 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerServiceWrapper.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerServiceWrapper.java
@@ -273,7 +273,7 @@ public Collection<Timer> getAllTimers(
             Collection<TimerPrimaryKey> timerIds
                     = timerService_.getTimerIds(containerIds);
             for (TimerPrimaryKey timerId : timerIds) {
-                timerWrappers.add(new TimerWrapper(timerId, persistentTimerService_));
+                timerWrappers.add(new TimerWrapper(timerId, timerService_));
             }
         }