You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2014/10/16 23:19:16 UTC
[8/8] git commit: Avoid using deprecated methods
Avoid using deprecated methods
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/72f868e2
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/72f868e2
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/72f868e2
Branch: refs/heads/master
Commit: 72f868e2613e28e2f67b5d57b1d593b37943face
Parents: 016afc4
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu Oct 16 22:47:20 2014 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu Oct 16 22:57:47 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/sshd/common/forward/TcpipServerChannel.java | 2 +-
.../src/main/java/org/apache/sshd/common/io/mina/MinaService.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/72f868e2/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipServerChannel.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipServerChannel.java b/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipServerChannel.java
index 8ed89d4..f2e0925 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipServerChannel.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipServerChannel.java
@@ -171,7 +171,7 @@ public class TcpipServerChannel extends AbstractServerChannel {
new Thread("TcpIpServerChannel-ConnectorCleanup") {
@Override
public void run() {
- connector.dispose();
+ connector.close(true);
}
}.start();
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/72f868e2/sshd-core/src/main/java/org/apache/sshd/common/io/mina/MinaService.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/io/mina/MinaService.java b/sshd-core/src/main/java/org/apache/sshd/common/io/mina/MinaService.java
index be678d7..6d962ed 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/io/mina/MinaService.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/io/mina/MinaService.java
@@ -59,7 +59,7 @@ public abstract class MinaService extends IoHandlerAdapter implements org.apache
}
public CloseFuture close(boolean immediately) {
- dispose();
+ getIoService().dispose();
return CloseableUtils.closed();
}