diff options
| author | James Moger <james.moger@gitblit.com> | 2013-07-02 14:51:42 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-07-02 14:51:42 -0400 |
| commit | 2e4b03f7fe33ed5b84ec98ce689f3e1cabf97bff (patch) | |
| tree | e0b59fa7c3b652a2a670dced53a6010c5ffe665d /src/main/java | |
| parent | 7aad02a8d251d87ccdb0a8737bc1d49749308ffc (diff) | |
| download | gitblit-2e4b03f7fe33ed5b84ec98ce689f3e1cabf97bff.tar.gz gitblit-2e4b03f7fe33ed5b84ec98ce689f3e1cabf97bff.zip | |
Fixed GitDaemon stop for unit tests
Diffstat (limited to 'src/main/java')
| -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;
}
}
}
|