Merge pull request #228 from t2t-sonbui/fix-write-thread

Fix Write Thread does not stop when close port
felHR85 · Apr 5, 2019 · 5eddda9 · 5eddda9
2 parents 41ced7c + 001e745
commit 5eddda9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/usbserial/src/main/java/com/felhr/usbserial/AbstractWorkerThread.java b/usbserial/src/main/java/com/felhr/usbserial/AbstractWorkerThread.java
@@ -3,13 +3,21 @@
 abstract class AbstractWorkerThread extends Thread {
     boolean firstTime = true;
     private volatile boolean keep = true;
+    private volatile Thread workingThread;
 
     void stopThread() {
         keep = false;
+        if (this.workingThread != null) {
+            this.workingThread.interrupt();
+        }
     }
 
     public final void run() {
-        while (keep) {
+        if (!this.keep) {
+            return;
+        }
+        this.workingThread = Thread.currentThread();
+        while (this.keep && (!this.workingThread.isInterrupted())) {
             doRun();
         }
     }

diff --git a/usbserial/src/main/java/com/felhr/usbserial/SerialBuffer.java b/usbserial/src/main/java/com/felhr/usbserial/SerialBuffer.java
@@ -118,6 +118,7 @@ synchronized byte[] get()
                 } catch (InterruptedException e)
                 {
                     e.printStackTrace();
+                    Thread.currentThread().interrupt();
                 }
             }
             byte[] dst;