If someone had managed to somehow interrupt the private thread running in SingleShotLinearTimer, it would busy wait out the rest of its remaining time. Now it goes back to sleep, then restores the interrupt flag. Shouldn't be possible outside of a debugger either way.

Author: dhakimTRX

src/main/java/com/rabbitmq/utility/SingleShotLinearTimer.java

@@ -72,21 +72,27 @@ public TimerThread(long timeoutMillisec) {
         public void run() {
             try {
                 long now;
-                while ((now = System.nanoTime() / NANOS_IN_MILLI) < _runTime) {
-                    if (_task == null) break;
+                boolean wasInterrupted = false;
+                try {
+                    while ((now = System.nanoTime() / NANOS_IN_MILLI) < _runTime) {
+                        if (_task == null) break;
 
-                    try {
-                        synchronized(this) {
-                            wait(_runTime - now);
+                        try {
+                            synchronized(this) {
+                                wait(_runTime - now);
+                            }
+                        } catch (InterruptedException e) {
+                            wasInterrupted = true;
                         }
-                    } catch (InterruptedException e) {
-                        Thread.currentThread().interrupt();
                     }
+                } finally {
+                    if (wasInterrupted)
+                        Thread.currentThread().interrupt();
                 }
 
                 Runnable task = _task;
                 if (task != null) {
-                    task.run();                    
+                    task.run();
                 }
 
             } finally {