From ca2fb431cdeaa2d7ad443ab16c9463473dbfb629 Mon Sep 17 00:00:00 2001
From: Bart Van Dosselaer <axalx@MORLI035.agfahealthcare.com>
Date: Wed, 9 Dec 2015 10:28:42 +0100
Subject: [PATCH] no message

---
 .../deployment/TimerResourceDefinition.java        | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/deployment/TimerResourceDefinition.java b/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/deployment/TimerResourceDefinition.java
index 195f336..c3cd16e 100644
--- a/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/deployment/TimerResourceDefinition.java
+++ b/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/deployment/TimerResourceDefinition.java
@@ -222,6 +222,9 @@ public class TimerResourceDefinition<T extends EJBComponent> extends SimpleResou
 
             @Override
             protected void readAttribute(TimerImpl timer, ModelNode toSet) {
+                if(timer.isCanceled()) {
+                    return;
+                }
                 try {
                     final long time = timer.getTimeRemaining();
                     toSet.set(time);
@@ -238,6 +241,9 @@ public class TimerResourceDefinition<T extends EJBComponent> extends SimpleResou
 
             @Override
             protected void readAttribute(TimerImpl timer, ModelNode toSet) {
+                if(timer.isCanceled()) {
+                    return;
+                }
                 try {
                     final Date d = timer.getNextTimeout();
                     if (d != null) {
@@ -253,6 +259,9 @@ public class TimerResourceDefinition<T extends EJBComponent> extends SimpleResou
 
             @Override
             protected void readAttribute(TimerImpl timer, ModelNode toSet) {
+                if(timer.isCanceled()) {
+                    return;
+                }
                 final boolean calendarTimer = timer.isCalendarTimer();
                 toSet.set(calendarTimer);
             }
@@ -262,6 +271,9 @@ public class TimerResourceDefinition<T extends EJBComponent> extends SimpleResou
 
             @Override
             protected void readAttribute(TimerImpl timer, ModelNode toSet) {
+                if(timer.isCanceled()) {
+                    return;
+                }
                 final boolean persistent = timer.isPersistent();
                 toSet.set(persistent);
             }
@@ -271,6 +283,9 @@ public class TimerResourceDefinition<T extends EJBComponent> extends SimpleResou
 
             @Override
             protected void readAttribute(TimerImpl timer, ModelNode toSet) {
+                if(timer.isCanceled()) {
+                    return;
+                }
                 final boolean active = timer.isActive();
                 toSet.set(active);
             }
@@ -280,6 +295,9 @@ public class TimerResourceDefinition<T extends EJBComponent> extends SimpleResou
 
             @Override
             protected void readAttribute(TimerImpl timer, ModelNode toSet) {
+                if(timer.isCanceled()) {
+                    return;
+                }
                 if (!timer.isCalendarTimer()) {
                     return;
                 }
@@ -315,6 +333,9 @@ public class TimerResourceDefinition<T extends EJBComponent> extends SimpleResou
 
             @Override
             protected void readAttribute(TimerImpl timer, ModelNode toSet) {
+                if(timer.isCanceled()) {
+                    return;
+                }
                 final Object pk = timer.getPrimaryKey();
                 if (pk != null) {
                     toSet.set(pk.toString());
@@ -326,6 +347,9 @@ public class TimerResourceDefinition<T extends EJBComponent> extends SimpleResou
 
             @Override
             protected void readAttribute(TimerImpl timer, ModelNode toSet) {
+                if(timer.isCanceled()) {
+                    return;
+                }
                 if (timer.getInfo() != null) {
                     toSet.set(timer.getInfo().toString());
                 }
-- 
1.9.5.msysgit.0