Repository: mina Updated Branches: refs/heads/2.0 787363ba2 -> 1af2c97ae
Removed any reference to a call to deprecated IoSession.close() method Project: http://git-wip-us.apache.org/repos/asf/mina/repo Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/1af2c97a Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/1af2c97a Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/1af2c97a Branch: refs/heads/2.0 Commit: 1af2c97ae573f251b5c99185ecda55897418b5ec Parents: 787363b Author: Jeff MAURY <[email protected]> Authored: Thu Sep 15 14:03:28 2016 +0200 Committer: Jeff MAURY <[email protected]> Committed: Thu Sep 15 14:03:28 2016 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/mina/core/filterchain/IoFilter.java | 2 +- .../main/java/org/apache/mina/core/filterchain/IoFilterChain.java | 2 +- .../main/java/org/apache/mina/core/session/AbstractIoSession.java | 2 ++ .../java/org/apache/mina/transport/vmpipe/VmPipeConnector.java | 2 +- .../java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java | 2 +- .../org/apache/mina/filter/buffer/BufferedWriteFilterTest.java | 2 +- .../src/main/java/org/apache/mina/http/HttpClientDecoder.java | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina/blob/1af2c97a/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java ---------------------------------------------------------------------- diff --git a/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java b/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java index 14e21af..4283240 100644 --- a/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java +++ b/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java @@ -246,7 +246,7 @@ public interface IoFilter { void messageSent(NextFilter nextFilter, IoSession session, WriteRequest writeRequest) throws Exception; /** - * Filters {@link IoSession#close(boolean)} method invocation. + * Filters {@link IoSession#closeNow()} or a {@link IoSession#closeOnFlush()} method invocations. * * @param nextFilter * the {@link NextFilter} for this filter. You can reuse this http://git-wip-us.apache.org/repos/asf/mina/blob/1af2c97a/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java ---------------------------------------------------------------------- diff --git a/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java b/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java index ef5c979..96e26b9 100644 --- a/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java +++ b/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java @@ -322,7 +322,7 @@ public interface IoFilterChain { void fireFilterWrite(WriteRequest writeRequest); /** - * Fires a {@link IoSession#close(boolean)} event. Most users don't need to call this method at + * Fires a {@link IoSession#closeNow()} or a {@link IoSession#closeOnFlush()} event. Most users don't need to call this method at * all. Please use this method only when you implement a new transport or fire a virtual * event. */ http://git-wip-us.apache.org/repos/asf/mina/blob/1af2c97a/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java ---------------------------------------------------------------------- diff --git a/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java b/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java index 179f790..c88ebcf 100644 --- a/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java +++ b/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java @@ -401,8 +401,10 @@ public abstract class AbstractIoSession implements IoSession { Queue<ReadFuture> readyReadFutures = getReadyReadFutures(); ReadFuture future; + synchronized (readyReadFutures) { future = readyReadFutures.poll(); + if (future != null) { if (future.isClosed()) { // Let other readers get notified. http://git-wip-us.apache.org/repos/asf/mina/blob/1af2c97a/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java ---------------------------------------------------------------------- diff --git a/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java b/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java index 9804ce7..25791da 100644 --- a/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java +++ b/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java @@ -135,7 +135,7 @@ public final class VmPipeConnector extends AbstractIoConnector { idleChecker.addSession(remoteSession); } catch (Exception e) { ExceptionMonitor.getInstance().exceptionCaught(e); - remoteSession.close(true); + remoteSession.closeNow(); } // Start chains, and then allow and messages read/written to be processed. This is to ensure that http://git-wip-us.apache.org/repos/asf/mina/blob/1af2c97a/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java ---------------------------------------------------------------------- diff --git a/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java b/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java index edf2050..3872e04 100644 --- a/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java +++ b/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java @@ -253,7 +253,7 @@ class VmPipeFilterChain extends DefaultIoFilterChain { session.getLock().lock(); if (!session.getCloseFuture().isClosed()) { session.getServiceListeners().fireSessionDestroyed(session); - session.getRemoteSession().close(true); + session.getRemoteSession().closeNow(); } } finally { session.getLock().unlock(); http://git-wip-us.apache.org/repos/asf/mina/blob/1af2c97a/mina-core/src/test/java/org/apache/mina/filter/buffer/BufferedWriteFilterTest.java ---------------------------------------------------------------------- diff --git a/mina-core/src/test/java/org/apache/mina/filter/buffer/BufferedWriteFilterTest.java b/mina-core/src/test/java/org/apache/mina/filter/buffer/BufferedWriteFilterTest.java index e7a6efc..b257b81 100644 --- a/mina-core/src/test/java/org/apache/mina/filter/buffer/BufferedWriteFilterTest.java +++ b/mina-core/src/test/java/org/apache/mina/filter/buffer/BufferedWriteFilterTest.java @@ -98,6 +98,6 @@ public class BufferedWriteFilterTest { // Flush the final byte bFilter.flush(sess); - sess.close(true); + sess.closeNow(); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mina/blob/1af2c97a/mina-http/src/main/java/org/apache/mina/http/HttpClientDecoder.java ---------------------------------------------------------------------- diff --git a/mina-http/src/main/java/org/apache/mina/http/HttpClientDecoder.java b/mina-http/src/main/java/org/apache/mina/http/HttpClientDecoder.java index bd3e9a0..c042970 100644 --- a/mina-http/src/main/java/org/apache/mina/http/HttpClientDecoder.java +++ b/mina-http/src/main/java/org/apache/mina/http/HttpClientDecoder.java @@ -119,7 +119,7 @@ public class HttpClientDecoder implements ProtocolDecoder { LOG.debug("no content len but chunked"); session.setAttribute(BODY_CHUNKED, Boolean.TRUE); } else if ("close".equalsIgnoreCase(rp.getHeader("connection"))) { - session.close(true); + session.closeNow(); } else { throw new HttpException(HttpStatus.CLIENT_ERROR_LENGTH_REQUIRED, "no content length !"); }
