commit | 03657f027eb7114cabcdb445eecf498fcf5433be | [log] [tgz] |
---|---|---|
author | Lyor Goldstein <lyor.goldstein@gmail.com> | Wed Jul 27 20:17:11 2016 +0300 |
committer | Lyor Goldstein <lyor.goldstein@gmail.com> | Wed Jul 27 20:17:11 2016 +0300 |
tree | bf59129255febc1fbc221d9b660d8bf26f9677d6 | |
parent | 1035f5b2caf2641f20ee4e8707567a9670584d56 [diff] |
Replaced deprecated IoSession#close method with up-to-date ones
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 @@ @Override public void inputClosed(IoSession session) throws Exception { - session.close(true); + session.closeNow(); } @Override
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 @@ @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);