Testing thread interruption.

Signed-off-by: Santiago Pericas-Geertsen <[email protected]>
spericas · Nov 25, 2024 · d755e24 · d755e24
1 parent 7f9d8ac
commit d755e24
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/common/socket/src/main/java/io/helidon/common/socket/SmartSocketWriter.java b/common/socket/src/main/java/io/helidon/common/socket/SmartSocketWriter.java
@@ -55,7 +55,7 @@ public void write(BufferData buffer) {
                 asyncMode = false;
             }
         } else {
-            asyncWriter.drainQueue();
+            asyncWriter.drainQueueAndInterrupt();
             writeNow(buffer);       // blocking write
         }
     }

diff --git a/common/socket/src/main/java/io/helidon/common/socket/SocketWriterAsync.java b/common/socket/src/main/java/io/helidon/common/socket/SocketWriterAsync.java
@@ -40,7 +40,7 @@ class SocketWriterAsync extends SocketWriter implements DataWriter {
     private final AtomicBoolean started = new AtomicBoolean(false);
     private volatile Throwable caught;
     private volatile boolean run = true;
-    private Thread thread;
+    private volatile Thread thread;
     private double avgQueueSize;
 
     /**
@@ -142,14 +142,20 @@ private void checkRunning() {
             executor.submit(this::run);
         }
         if (!run) {
+
             throw new SocketWriterException(caught);
         }
     }
 
-    void drainQueue() {
-        BufferData buffer;
-        while ((buffer = writeQueue.poll()) != null) {
-            writeNow(buffer);
+    void drainQueueAndInterrupt() {
+        if (thread != null) {
+            thread.interrupt();
+            thread = null;
+
+            BufferData buffer;
+            while ((buffer = writeQueue.poll()) != null) {
+                writeNow(buffer);
+            }
         }
     }