You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by lg...@apache.org on 2016/07/27 17:15:50 UTC
[2/2] mina-sshd git commit: Replaced deprecated IoSession#close
method with up-to-date ones
Replaced deprecated IoSession#close method with up-to-date ones
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/03657f02
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/03657f02
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/03657f02
Branch: refs/heads/master
Commit: 03657f027eb7114cabcdb445eecf498fcf5433be
Parents: 1035f5b
Author: Lyor Goldstein <ly...@gmail.com>
Authored: Wed Jul 27 20:17:11 2016 +0300
Committer: Lyor Goldstein <ly...@gmail.com>
Committed: Wed Jul 27 20:17:11 2016 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/sshd/common/io/mina/MinaService.java | 2 +-
.../src/main/java/org/apache/sshd/common/io/mina/MinaSession.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/03657f02/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 654c0b0..2bff584 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
@@ -92,7 +92,7 @@ public abstract class MinaService extends AbstractCloseable implements org.apach
@Override
public void inputClosed(IoSession session) throws Exception {
- session.close(true);
+ session.closeNow();
}
@Override
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/03657f02/sshd-core/src/main/java/org/apache/sshd/common/io/mina/MinaSession.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/io/mina/MinaSession.java b/sshd-core/src/main/java/org/apache/sshd/common/io/mina/MinaSession.java
index 9a34af1..b03da53 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/io/mina/MinaSession.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/io/mina/MinaSession.java
@@ -115,7 +115,8 @@ public class MinaSession extends AbstractInnerCloseable implements IoSession {
@SuppressWarnings("synthetic-access")
@Override
public org.apache.sshd.common.future.CloseFuture close(boolean immediately) {
- session.close(false).addListener(new IoFutureListener<IoFuture>() {
+ org.apache.mina.core.future.CloseFuture cf = immediately ? session.closeNow() : session.closeOnFlush();
+ cf.addListener(new IoFutureListener<IoFuture>() {
@Override
public void operationComplete(IoFuture f) {
future.setValue(Boolean.TRUE);