Merge branch 'mrniko:master' into websocket-leak-fix

mrniko · Aug 6, 2024 · 9675e98 · 9675e98
2 parents 17ed3a0 + 6981e0c
commit 9675e98
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);