Merge pull request #991 from berinhardt/master

Fix HashedWheelTimeoutScheduler removing scheduledFutures after task
mrniko · Jul 27, 2024 · 6981e0c · 6981e0c
2 parents 08359a3 + 99eea0a
commit 6981e0c
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/src/main/java/com/corundumstudio/socketio/scheduler/HashedWheelTimeoutScheduler.java b/src/main/java/com/corundumstudio/socketio/scheduler/HashedWheelTimeoutScheduler.java
@@ -80,11 +80,8 @@ public void run(Timeout timeout) throws Exception {
                 ctx.executor().execute(new Runnable() {
                     @Override
                     public void run() {
-                        try {
-                            runnable.run();
-                        } finally {
-                            scheduledFutures.remove(key);
-                        }
+                    	scheduledFutures.remove(key);
+                        runnable.run();
                     }
                 });
             }
@@ -98,11 +95,8 @@ public void schedule(final SchedulerKey key, final Runnable runnable, long delay
         Timeout timeout = executorService.newTimeout(new TimerTask() {
             @Override
             public void run(Timeout timeout) throws Exception {
-                try {
-                    runnable.run();
-                } finally {
-                    scheduledFutures.remove(key);
-                }
+                scheduledFutures.remove(key);
+                runnable.run();
             }
         }, delay, unit);