Merge pull request #3777 from jGauravGupta/PAYARA-3494

PAYARA-3494 PersistentEJBTimerService not serializable
payara · Feb 25, 2019 · 6323838 · 6323838
2 parents ecd669d + dc81c3c
commit 6323838
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/TimerWrapper.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/TimerWrapper.java
@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-// Portions Copyright [2018] [Payara Foundation and/or its affiliates]
+// Portions Copyright [2018-2019] [Payara Foundation and/or its affiliates]
 
 package com.sun.ejb.containers;
 
@@ -296,7 +296,7 @@ private static class TimerHandleImpl implements TimerHandle {
 
         private final TimerPrimaryKey timerId_;
 
-        private final EJBTimerService timerService_;
+        private transient EJBTimerService timerService_;
 
         public TimerHandleImpl(TimerPrimaryKey timerId, EJBTimerService timerService) {
             timerId_ = timerId;
@@ -338,6 +338,9 @@ private TimerWrapper getTimerInternal()
             // Can't store a static ref because in embedded container it can be
             // changed by server restart
             // Timer handles are only available for persistent timers.
+            if (timerService_ == null) {
+                timerService_ = EJBTimerService.getPersistentTimerService();
+            }
 
             if( timerService_ != null ) {
                 if( timerService_.timerExists(timerId_) ) {