浏览代码

fix ZillaRuntime.terminate

tags/2.0.1
Jonathan Cobb 4 年前
父节点
当前提交
3bb311f7fa
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. +1
    -1
      src/main/java/org/cobbzilla/util/daemon/TerminationRequestResult.java
  2. +1
    -1
      src/main/java/org/cobbzilla/util/daemon/ZillaRuntime.java

+ 1
- 1
src/main/java/org/cobbzilla/util/daemon/TerminationRequestResult.java 查看文件

@@ -2,6 +2,6 @@ package org.cobbzilla.util.daemon;

public enum TerminationRequestResult {

alive, interrupted, terminated;
alive, dead, interrupted, terminated;

}

+ 1
- 1
src/main/java/org/cobbzilla/util/daemon/ZillaRuntime.java 查看文件

@@ -75,7 +75,7 @@ public class ZillaRuntime {
}

public static TerminationRequestResult terminate(Thread thread, long timeout, Function<Thread, Boolean> onlyIf, boolean verbose) {
if (thread == null || !thread.isAlive()) return TerminationRequestResult.alive;
if (thread == null || !thread.isAlive()) return TerminationRequestResult.dead;
if (onlyIf != null && !onlyIf.apply(thread)) {
if (log.isWarnEnabled()) log.warn("terminate: thread is alive but onlyIf function returned false, not interrupting: " + thread + (verbose ? " with stack " + stacktrace(thread) + "\nfrom: " + stacktrace() : ""));
return TerminationRequestResult.alive;


正在加载...
取消
保存