diff options
| -rw-r--r-- | src/main/java/com/gitblit/git/GitDaemon.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/com/gitblit/git/GitDaemon.java b/src/main/java/com/gitblit/git/GitDaemon.java index 3c45171f..b760fbcc 100644 --- a/src/main/java/com/gitblit/git/GitDaemon.java +++ b/src/main/java/com/gitblit/git/GitDaemon.java @@ -245,8 +245,8 @@ public class GitDaemon { //
} finally {
acceptSocket = null;
- acceptThread = null;
}
+
}
};
acceptThread.start();
@@ -261,9 +261,9 @@ public class GitDaemon { /** Stop this daemon. */
public synchronized void stop() {
- if (acceptThread != null) {
- logger.info("Git Daemon stopping...");
+ if (isRunning() && acceptThread != null) {
run.set(false);
+ logger.info("Git Daemon stopping...");
try {
// close the accept socket
// this throws a SocketException in the accept thread
@@ -276,6 +276,8 @@ public class GitDaemon { logger.info("Git Daemon stopped.");
} catch (InterruptedException e) {
logger.error("Accept thread join interrupted", e);
+ } finally {
+ acceptThread = null;
}
}
}
|