fixbugs

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/utils/TaskLock.java

@@ -99,7 +99,7 @@ public class TaskLock {
         }
     }
 
-    public synchronized void clear(long expireTime) {
+    public synchronized void expire(long expireTime) {
         long current = System.currentTimeMillis();
         LockNode node = head.next;
         while (node != null) {
@@ -206,7 +206,9 @@ public class TaskLock {
 
         private void remove() {
             this.previous.next = this.next;
-            this.next.previous = this.previous;
+            if (this.next != null) {
+                this.next.previous = this.previous;
+            }
         }
 
         private void append(Object id, int number, Object owner) {

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/utils/TaskLockUtil.java

@@ -17,7 +17,7 @@ public class TaskLockUtil {
                 for (String key : formalTaskMap.keySet()) {
                     TaskLock taskLock = formalTaskMap.get(key);
                     if (taskLock != null) {
-                        taskLock.clear(timeoutMinute);
+                        taskLock.expire(timeoutMinute);
                     }
                 }
             }
@@ -25,7 +25,7 @@ public class TaskLockUtil {
                 for (String key : trialTaskMap.keySet()) {
                     TaskLock taskLock = trialTaskMap.get(key);
                     if (taskLock != null) {
-                        taskLock.clear(timeoutMinute);
+                        taskLock.expire(timeoutMinute);
                     }
                 }
             }