Make sure cancelled scheduled tasks will not run again if cancelled b…

…efore
ran-su · Mar 22, 2013 · 624bda4 · 624bda4
1 parent 28576aa
commit 624bda4
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/common/src/main/java/io/netty/util/concurrent/SingleThreadEventExecutor.java b/common/src/main/java/io/netty/util/concurrent/SingleThreadEventExecutor.java
@@ -800,16 +800,19 @@ public void run() {
                         setSuccessInternal(result);
                     }
                 } else {
-                    task.call();
-                    if (!executor().isShutdown()) {
-                        long p = periodNanos;
-                        if (p > 0) {
-                            deadlineNanos += p;
-                        } else {
-                            deadlineNanos = nanoTime() - p;
-                        }
-                        if (!isDone()) {
-                            executor().delayedTaskQueue.add(this);
+                    // check if is done as it may was cancelled
+                    if (!isDone()) {
+                        task.call();
+                        if (!executor().isShutdown()) {
+                            long p = periodNanos;
+                            if (p > 0) {
+                                deadlineNanos += p;
+                            } else {
+                                deadlineNanos = nanoTime() - p;
+                            }
+                            if (!isDone()) {
+                                executor().delayedTaskQueue.add(this);
+                            }
                         }
                     }
                 }