Fix bug with removing non-persistent timers

jbossejb3 · Aug 3, 2011 · 3333454 · 3333454
1 parent 1e1ce65
commit 3333454
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/timerservice-mk2/src/main/java/org/jboss/ejb3/timerservice/mk2/TimerImpl.java b/timerservice-mk2/src/main/java/org/jboss/ejb3/timerservice/mk2/TimerImpl.java
@@ -214,12 +214,12 @@ public void cancel() throws IllegalStateException, NoSuchObjectLocalException, E
         if (currentTx == null) {
             // cancel any scheduled Future for this timer
             this.cancelTimeout();
+            // persist changes
+            timerService.persistTimer(this);
         } else {
             this.registerTimerCancellationWithTx(currentTx);
         }
 
-        // persist changes
-        timerService.persistTimer(this);
     }
 
     /**
@@ -720,6 +720,7 @@ public void afterCompletion(int status) {
                     case IN_TIMEOUT:
                     case RETRY_TIMEOUT:
                         this.timer.cancelTimeout();
+                        timerService.persistTimer(timer);
                         break;
 
                 }

diff --git a/timerservice-mk2/src/main/java/org/jboss/ejb3/timerservice/mk2/TimerServiceImpl.java b/timerservice-mk2/src/main/java/org/jboss/ejb3/timerservice/mk2/TimerServiceImpl.java
@@ -1008,8 +1008,10 @@ public void afterCompletion(int status) {
                 TimerState timerState = this.timer.getState();
                 switch (timerState) {
                     case ACTIVE:
+                        if (this.timer.isPersistent()) {
+                            timerPersistence.removeTimer(this.timer.getPersistentState());
+                        }
                         this.timer.setTimerState(TimerState.CANCELED);
-                        timerPersistence.removeTimer(this.timer.getPersistentState());
                         break;
                 }