summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@sonymobile.com>2015-04-07 09:57:20 +0900
committerDavid Pursehouse <david.pursehouse@sonymobile.com>2015-04-07 09:57:20 +0900
commitce3cf6c83a3664a1ba73002006e64c1a65ca4309 (patch)
tree7b26a1d3a240f1cd08709f27c6d849cd4fe3c550
parent050d698403c7f5051eeda8b04c5ba0ff5821e540 (diff)
SshDaemon: Don't use deprecated IoAcceptor.dispose()
-rw-r--r--gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
index 5ef4765bb5..7b910b2665 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
@@ -328,8 +328,10 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener {
public synchronized void stop() {
if (acceptor != null) {
try {
- acceptor.dispose();
+ acceptor.close(true).await();
log.info("Stopped Gerrit SSHD");
+ } catch (InterruptedException e) {
+ log.warn("Exception caught while closing", e);
} finally {
acceptor = null;
}