fix: Thread.interrupt() not working

common/src/main/java/com/stardust/lang/ThreadCompat.java

@@ -1,7 +1,9 @@
 package com.stardust.lang;
 
 import java.lang.ref.WeakReference;
+import java.util.Collections;
 import java.util.Hashtable;
+import java.util.Set;
 import java.util.WeakHashMap;
 
 /**
@@ -10,72 +12,58 @@ import java.util.WeakHashMap;
 
 public class ThreadCompat extends Thread {
 
-   // private static volatile WeakHashMap<Thread, Boolean> interruptStatus = new WeakHashMap<>();
+    // FIXME: 2017/12/29 是否需要用synchronizedMap?这里虽然线程不安全，但竞争很小
+    private static final Set<Thread> interruptedThreads = Collections.newSetFromMap(new WeakHashMap<Thread, Boolean>());
 
     public ThreadCompat() {
-        init();
-    }
-
-    private void init() {
-  //      interruptStatus.put(this, false);
     }
 
     public ThreadCompat(Runnable target) {
         super(target);
-        init();
     }
 
     public ThreadCompat(ThreadGroup group, Runnable target) {
         super(group, target);
-        init();
     }
 
     public ThreadCompat(String name) {
         super(name);
-        init();
     }
 
     public ThreadCompat(ThreadGroup group, String name) {
         super(group, name);
-        init();
     }
 
     public ThreadCompat(Runnable target, String name) {
         super(target, name);
-        init();
     }
 
     public ThreadCompat(ThreadGroup group, Runnable target, String name) {
         super(group, target, name);
-        init();
     }
 
     public ThreadCompat(ThreadGroup group, Runnable target, String name, long stackSize) {
         super(group, target, name, stackSize);
-        init();
-    }
-
-    @Override
-    public void run() {
-        try {
-            super.run();
-            //   interruptStatus.remove(this);
-        } catch (Throwable e) {
-            // interruptStatus.remove(this);
-            throw e;
-        }
     }
 
     @Override
     public boolean isInterrupted() {
-        //Boolean isInterrupted = interruptStatus.get(this);
-        return super.isInterrupted();// || isInterrupted == null || isInterrupted;
+        return super.isInterrupted() || interruptedThreads.contains(this);
     }
 
+    public static boolean interrupted() {
+        boolean interrupted = Thread.currentThread().isInterrupted();
+        interruptedThreads.remove(Thread.currentThread());
+        Thread.interrupted();
+        return interrupted;
+    }
+
+
     @Override
     public void interrupt() {
         super.interrupt();
-        //interruptStatus.put(this, true);
+        interruptedThreads.add(this);
     }
 
+
 }