some bugs fixed

cnzf1 · Apr 20, 2017 · d06ded6 · d06ded6
1 parent 38df165
commit d06ded6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 
 一款简单超轻量级的线程池管理器
 
-- 为什么会需要此
+- 为什么会需要此框架
 
 
 ### 依赖

diff --git a/easythread/src/main/java/com/lzh/easythread/CallableWrapper.java b/easythread/src/main/java/com/lzh/easythread/CallableWrapper.java
@@ -17,11 +17,13 @@ final class CallableWrapper<T> implements Callable<T> {
 
     @Override
     public T call() throws Exception {
+        Tools.resetThread(Thread.currentThread(),name,callback);
         if (callback != null) {
             callback.onStart(Thread.currentThread());
         }
-        Tools.resetThread(Thread.currentThread(),name,callback);
-        T t = proxy.call();
+
+        // avoid NullPointException
+        T t = proxy == null ? null : proxy.call();
         if (callback != null)  {
             callback.onCompleted(Thread.currentThread());
         }

diff --git a/easythread/src/main/java/com/lzh/easythread/RunnableWrapper.java b/easythread/src/main/java/com/lzh/easythread/RunnableWrapper.java
@@ -17,11 +17,14 @@ final class RunnableWrapper implements Runnable {
 
     @Override
     public void run() {
+        Tools.resetThread(Thread.currentThread(),name,callback);
         if (callback != null) {
             callback.onStart(Thread.currentThread());
         }
-        Tools.resetThread(Thread.currentThread(),name,callback);
-        proxy.run();
+        // avoid NullPointException
+        if (proxy != null) {
+            proxy.run();
+        }
         if (callback != null)  {
             callback.onCompleted(Thread.currentThread());
         }