You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by jv...@apache.org on 2008/11/09 23:33:01 UTC
svn commit: r712577 - in /mina/sandbox/jvermillard/mina-cleaning:
core/src/main/java/org/apache/mina/core/filterchain/
core/src/main/java/org/apache/mina/core/future/
core/src/main/java/org/apache/mina/core/service/
core/src/main/java/org/apache/mina/c...
Author: jvermillard
Date: Sun Nov 9 14:33:00 2008
New Revision: 712577
URL: http://svn.apache.org/viewvc?rev=712577&view=rev
Log:
DIRMINA-620 : removed some session closing methods
Modified:
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/future/CloseFuture.java
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/future/IoFutureListener.java
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/service/AbstractIoConnector.java
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/service/IoServiceListenerSupport.java
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/session/ExpiringSessionRecycler.java
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/session/IoSession.java
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveRequestTimeoutHandler.java
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/handler/demux/ExceptionHandler.java
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/handler/stream/IoSessionOutputStream.java
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/proxy/AbstractProxyLogicHandler.java
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java
mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/filter/buffer/BufferedWriteFilterTest.java
mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java
mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/filter/stream/AbstractStreamWriteFilterTest.java
mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java
mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/AbstractConnectorTest.java
mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/AbstractFileRegionTest.java
mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java
mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java
mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java
mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeEventOrderTest.java
mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java
mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java
mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java
mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/gettingstarted/timeserver/TimeServerHandler.java
mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/imagine/step1/client/ImageClient.java
mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/netcat/NetCatProtocolHandler.java
mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java
mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/proxy/ClientToProxyIoHandler.java
mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/reverser/ReverseProtocolHandler.java
mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java
mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java
mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/tapedeck/AuthenticationHandler.java
mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/tapedeck/TapeDeckServer.java
mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/tennis/TennisPlayer.java
mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/udp/MemoryMonitorHandler.java
mina/sandbox/jvermillard/mina-cleaning/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java
mina/sandbox/jvermillard/mina-cleaning/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java
mina/sandbox/jvermillard/mina-cleaning/example/src/test/java/org/apache/mina/example/proxy/ClientSessionHandler.java
mina/sandbox/jvermillard/mina-cleaning/example/src/test/java/org/apache/mina/example/proxy/telnet/TelnetSessionHandler.java
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java Sun Nov 9 14:33:00 2008
@@ -488,7 +488,7 @@
} else {
// Please note that this place is not the only place that
// calls ConnectFuture.setException().
- session.close();
+ session.close(true);
future.setException(cause);
}
}
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/future/CloseFuture.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/future/CloseFuture.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/future/CloseFuture.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/future/CloseFuture.java Sun Nov 9 14:33:00 2008
@@ -26,7 +26,7 @@
* <h3>Example</h3>
* <pre>
* IoSession session = ...;
- * CloseFuture future = session.close();
+ * CloseFuture future = session.close(true);
* // Wait until the connection is closed
* future.awaitUninterruptibly();
* // Now connection should be closed.
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/future/IoFutureListener.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/future/IoFutureListener.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/future/IoFutureListener.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/future/IoFutureListener.java Sun Nov 9 14:33:00 2008
@@ -37,7 +37,7 @@
*/
static IoFutureListener<IoFuture> CLOSE = new IoFutureListener<IoFuture>() {
public void operationComplete(IoFuture future) {
- future.getSession().close();
+ future.getSession().close(true);
}
};
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/service/AbstractIoConnector.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/service/AbstractIoConnector.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/service/AbstractIoConnector.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/service/AbstractIoConnector.java Sun Nov 9 14:33:00 2008
@@ -280,7 +280,7 @@
future.addListener(new IoFutureListener<ConnectFuture>() {
public void operationComplete(ConnectFuture future) {
if (future.isCanceled()) {
- session.close();
+ session.close(true);
}
}
});
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/service/IoServiceListenerSupport.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/service/IoServiceListenerSupport.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/service/IoServiceListenerSupport.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/service/IoServiceListenerSupport.java Sun Nov 9 14:33:00 2008
@@ -246,7 +246,7 @@
IoFutureListener<IoFuture> listener = new LockNotifyingListener(lock);
for (IoSession s : managedSessions.values()) {
- s.close().addListener(listener);
+ s.close(true).addListener(listener);
}
try {
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java Sun Nov 9 14:33:00 2008
@@ -225,10 +225,7 @@
}
}
- /**
- * {@inheritDoc}
- */
- public final CloseFuture close() {
+ private final CloseFuture close() {
synchronized (lock) {
if (isClosing()) {
return closeFuture;
@@ -241,10 +238,7 @@
return closeFuture;
}
- /**
- * {@inheritDoc}
- */
- public final CloseFuture closeOnFlush() {
+ private final CloseFuture closeOnFlush() {
getWriteRequestQueue().offer(this, CLOSE_REQUEST);
getProcessor().flush(this);
return closeFuture;
@@ -1229,7 +1223,7 @@
request.getFuture().setException(cause);
session.getFilterChain().fireExceptionCaught(cause);
// WriteException is an IOException, so we close the session.
- session.close();
+ session.close(true);
}
}
}
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/session/ExpiringSessionRecycler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/session/ExpiringSessionRecycler.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/session/ExpiringSessionRecycler.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/session/ExpiringSessionRecycler.java Sun Nov 9 14:33:00 2008
@@ -110,7 +110,7 @@
private class DefaultExpirationListener implements
ExpirationListener<IoSession> {
public void expired(IoSession expiredSession) {
- expiredSession.close();
+ expiredSession.close(true);
}
}
}
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/session/IoSession.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/session/IoSession.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/session/IoSession.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/session/IoSession.java Sun Nov 9 14:33:00 2008
@@ -161,20 +161,6 @@
WriteFuture write(Object message, SocketAddress destination);
/**
- * Closes this session immediately. This operation is asynchronous.
- * Wait for the returned {@link CloseFuture} if you want to wait for
- * the session actually closed.
- */
- CloseFuture close();
-
- /**
- * Closes this session after all queued write requests are flushed.
- * This operation is asynchronous. Wait for the returned {@link CloseFuture}
- * if you want to wait for the session actually closed.
- */
- CloseFuture closeOnFlush();
-
- /**
* Closes this session immediately or after all queued write requests
* are flushed. This operation is asynchronous. Wait for the returned
* {@link CloseFuture} if you want to wait for the session actually closed.
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java Sun Nov 9 14:33:00 2008
@@ -229,7 +229,7 @@
private void blockSession(IoSession session) {
logger.warn("Remote address in the blacklist; closing.");
- session.close();
+ session.close(true);
}
private boolean isBlocked(IoSession session) {
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java Sun Nov 9 14:33:00 2008
@@ -123,7 +123,7 @@
throws Exception {
if (!isConnectionOk(session)) {
logger.warn("Connections coming in too fast; closing.");
- session.close();
+ session.close(true);
}
nextFilter.sessionCreated(session);
}
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveRequestTimeoutHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveRequestTimeoutHandler.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveRequestTimeoutHandler.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveRequestTimeoutHandler.java Sun Nov 9 14:33:00 2008
@@ -79,7 +79,7 @@
log.warn("Closing the session because a keep-alive response " +
"message was not received within {} second(s).",
filter.getRequestTimeout());
- session.close();
+ session.close(true);
}
};
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/handler/demux/ExceptionHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/handler/demux/ExceptionHandler.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/handler/demux/ExceptionHandler.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/handler/demux/ExceptionHandler.java Sun Nov 9 14:33:00 2008
@@ -46,7 +46,7 @@
*/
static ExceptionHandler<Throwable> CLOSE = new ExceptionHandler<Throwable>() {
public void exceptionCaught(IoSession session, Throwable cause) {
- session.close();
+ session.close(true);
}
};
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/handler/stream/IoSessionOutputStream.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/handler/stream/IoSessionOutputStream.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/handler/stream/IoSessionOutputStream.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/handler/stream/IoSessionOutputStream.java Sun Nov 9 14:33:00 2008
@@ -48,7 +48,7 @@
try {
flush();
} finally {
- session.close().awaitUninterruptibly();
+ session.close(true).awaitUninterruptibly();
}
}
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java Sun Nov 9 14:33:00 2008
@@ -157,7 +157,7 @@
in.throwException(e);
} else {
logger.warn("Unexpected exception.", cause);
- session.close();
+ session.close(true);
}
}
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/proxy/AbstractProxyLogicHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/proxy/AbstractProxyLogicHandler.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/proxy/AbstractProxyLogicHandler.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/proxy/AbstractProxyLogicHandler.java Sun Nov 9 14:33:00 2008
@@ -200,7 +200,7 @@
logger.error(message);
}
- getSession().close();
+ getSession().close(true);
}
protected void closeSession(final String message) {
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java Sun Nov 9 14:33:00 2008
@@ -130,7 +130,7 @@
idleChecker.addSession(remoteSession);
} catch (Throwable t) {
ExceptionMonitor.getInstance().exceptionCaught(t);
- remoteSession.close();
+ remoteSession.close(true);
}
// Start chains, and then allow and messages read/written to be processed. This is to ensure that
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java Sun Nov 9 14:33:00 2008
@@ -241,7 +241,7 @@
session.getLock().lock();
if (!session.getCloseFuture().isClosed()) {
session.getServiceListeners().fireSessionDestroyed(session);
- session.getRemoteSession().close();
+ session.getRemoteSession().close(true);
}
} finally {
session.getLock().unlock();
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/filter/buffer/BufferedWriteFilterTest.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/filter/buffer/BufferedWriteFilterTest.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/filter/buffer/BufferedWriteFilterTest.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/filter/buffer/BufferedWriteFilterTest.java Sun Nov 9 14:33:00 2008
@@ -99,6 +99,6 @@
// Flush the final byte
bFilter.flush(sess);
- sess.close();
+ sess.close(true);
}
}
\ No newline at end of file
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java Sun Nov 9 14:33:00 2008
@@ -306,7 +306,7 @@
public void sessionIdle(IoSession session, IdleStatus status) throws Exception {
logger.info("sessionIdle");
sessionIdleLatch.countDown();
- session.close();
+ session.close(true);
}
@Override
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/filter/stream/AbstractStreamWriteFilterTest.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/filter/stream/AbstractStreamWriteFilterTest.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/filter/stream/AbstractStreamWriteFilterTest.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/filter/stream/AbstractStreamWriteFilterTest.java Sun Nov 9 14:33:00 2008
@@ -426,7 +426,7 @@
@Override
public void sessionIdle(IoSession session, IdleStatus status)
throws Exception {
- session.close();
+ session.close(true);
}
@Override
@@ -449,7 +449,7 @@
bytesRead++;
}
if (bytesRead >= size) {
- session.close();
+ session.close(true);
}
}
}
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java Sun Nov 9 14:33:00 2008
@@ -226,7 +226,7 @@
@Override
public void exceptionCaught(IoSession session, Throwable cause) {
cause.printStackTrace();
- session.close();
+ session.close(true);
}
@Override
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/AbstractConnectorTest.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/AbstractConnectorTest.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/AbstractConnectorTest.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/AbstractConnectorTest.java Sun Nov 9 14:33:00 2008
@@ -76,7 +76,7 @@
"localhost", port));
future.awaitUninterruptibly();
buf.append("3");
- future.getSession().close();
+ future.getSession().close(true);
// sessionCreated() will fire before the connect future completes
// but sessionOpened() may not
Assert.assertTrue(Pattern.matches("12?32?", buf.toString()));
@@ -113,7 +113,7 @@
future.awaitUninterruptibly();
buf.append("1");
try {
- future.getSession().close();
+ future.getSession().close(true);
fail();
} catch (RuntimeIoException e) {
// OK.
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/AbstractFileRegionTest.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/AbstractFileRegionTest.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/AbstractFileRegionTest.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/AbstractFileRegionTest.java Sun Nov 9 14:33:00 2008
@@ -66,7 +66,7 @@
public void exceptionCaught(IoSession session, Throwable cause)
throws Exception {
exception[0] = cause;
- session.close();
+ session.close(true);
}
@Override
public void messageReceived(IoSession session, Object message) throws Exception {
@@ -83,7 +83,7 @@
}
if (index == FILE_SIZE / 4) {
success[0] = true;
- session.close();
+ session.close(true);
}
}
});
@@ -95,7 +95,7 @@
public void exceptionCaught(IoSession session, Throwable cause)
throws Exception {
exception[0] = cause;
- session.close();
+ session.close(true);
}
@Override
public void sessionClosed(IoSession session) throws Exception {
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java Sun Nov 9 14:33:00 2008
@@ -162,7 +162,7 @@
}
- session.close().awaitUninterruptibly();
+ session.close(true).awaitUninterruptibly();
}
private void write(IoSession session, String s) throws Exception {
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java Sun Nov 9 14:33:00 2008
@@ -83,7 +83,7 @@
writeFuture.awaitUninterruptibly();
Assert.assertTrue(writeFuture.isWritten());
- future.getSession().close();
+ future.getSession().close(true);
for (int i = 0; i < 30; i++) {
if (result.length() == 2) {
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java Sun Nov 9 14:33:00 2008
@@ -84,8 +84,7 @@
// Close the client-side connection.
// This doesn't mean that the acceptor-side connection is also closed.
// The life cycle of the acceptor-side connection is managed by the recycler.
- future.getSession().close();
- future.getSession().getCloseFuture().awaitUninterruptibly();
+ future.getSession().close(true);
Assert.assertTrue(future.getSession().getCloseFuture().isClosed());
// Wait until the acceptor-side connection is closed.
@@ -132,7 +131,7 @@
while (acceptorHandler.session == null) {
Thread.yield();
}
- acceptorHandler.session.close();
+ acceptorHandler.session.close(true);
Assert.assertTrue(
acceptorHandler.session.getCloseFuture().awaitUninterruptibly(3000));
@@ -158,11 +157,11 @@
while (acceptorHandler.session == null) {
Thread.yield();
}
- acceptorHandler.session.close();
+ acceptorHandler.session.close(true);
Assert.assertTrue(
acceptorHandler.session.getCloseFuture().awaitUninterruptibly(3000));
- future.getSession().close().awaitUninterruptibly();
+ future.getSession().close(true).awaitUninterruptibly();
Assert.assertNotSame(oldSession, acceptorHandler.session);
} finally {
Modified: mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeEventOrderTest.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeEventOrderTest.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeEventOrderTest.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeEventOrderTest.java Sun Nov 9 14:33:00 2008
@@ -53,7 +53,7 @@
@Override
public void messageSent(IoSession session, Object message)
throws Exception {
- session.close();
+ session.close(true);
}
});
@@ -133,7 +133,7 @@
@Override
public void messageSent(IoSession session, Object message)
throws Exception {
- session.close();
+ session.close(true);
}
});
@@ -194,7 +194,7 @@
ConnectFuture connectFuture = vmPipeConnector.connect(vmPipeAddress);
connectFuture.awaitUninterruptibly();
connectFuture.getSession().write(IoBuffer.wrap(new byte[1]));
- connectFuture.getSession().closeOnFlush().awaitUninterruptibly();
+ connectFuture.getSession().close(false).awaitUninterruptibly();
semaphore.tryAcquire(1, TimeUnit.SECONDS);
vmPipeAcceptor.unbind(vmPipeAddress);
Modified: mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java Sun Nov 9 14:33:00 2008
@@ -49,7 +49,7 @@
public void exceptionCaught(IoSession session, Throwable cause) {
logger.warn("Unexpected exception.", cause);
// Close connection when unexpected exception is caught.
- session.close();
+ session.close(true);
}
@Override
@@ -69,7 +69,7 @@
case ChatCommand.QUIT:
session.write("QUIT OK");
- session.close();
+ session.close(true);
break;
case ChatCommand.LOGIN:
@@ -149,7 +149,7 @@
synchronized (sessions) {
for (IoSession session : sessions) {
if (name.equals(session.getAttribute("user"))) {
- session.close();
+ session.close(true);
break;
}
}
Modified: mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java Sun Nov 9 14:33:00 2008
@@ -111,7 +111,7 @@
// Wait until the chat ends.
session.getCloseFuture().awaitUninterruptibly();
}
- session.close();
+ session.close(true);
}
}
Modified: mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java Sun Nov 9 14:33:00 2008
@@ -62,7 +62,7 @@
@Override
public void exceptionCaught(IoSession session, Throwable cause) {
- session.close();
+ session.close(true);
}
@Override
Modified: mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/gettingstarted/timeserver/TimeServerHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/gettingstarted/timeserver/TimeServerHandler.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/gettingstarted/timeserver/TimeServerHandler.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/gettingstarted/timeserver/TimeServerHandler.java Sun Nov 9 14:33:00 2008
@@ -44,7 +44,7 @@
{
String str = message.toString();
if( str.trim().equalsIgnoreCase("quit") ) {
- session.close();
+ session.close(true);
return;
}
Modified: mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/imagine/step1/client/ImageClient.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/imagine/step1/client/ImageClient.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/imagine/step1/client/ImageClient.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/imagine/step1/client/ImageClient.java Sun Nov 9 14:33:00 2008
@@ -74,7 +74,7 @@
public void disconnect() {
if (session != null) {
- session.close().awaitUninterruptibly(CONNECT_TIMEOUT);
+ session.close(true).awaitUninterruptibly(CONNECT_TIMEOUT);
session = null;
}
}
Modified: mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/netcat/NetCatProtocolHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/netcat/NetCatProtocolHandler.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/netcat/NetCatProtocolHandler.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/netcat/NetCatProtocolHandler.java Sun Nov 9 14:33:00 2008
@@ -51,7 +51,7 @@
public void sessionIdle(IoSession session, IdleStatus status) {
// Close the connection if reader is idle.
if (status == IdleStatus.READER_IDLE) {
- session.close();
+ session.close(true);
}
}
Modified: mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java Sun Nov 9 14:33:00 2008
@@ -52,7 +52,7 @@
if (session.getAttribute( OTHER_IO_SESSION ) != null) {
IoSession sess = (IoSession) session.getAttribute(OTHER_IO_SESSION);
sess.setAttribute(OTHER_IO_SESSION, null);
- sess.closeOnFlush();
+ sess.close(false);
session.setAttribute(OTHER_IO_SESSION, null);
}
}
Modified: mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/proxy/ClientToProxyIoHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/proxy/ClientToProxyIoHandler.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/proxy/ClientToProxyIoHandler.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/proxy/ClientToProxyIoHandler.java Sun Nov 9 14:33:00 2008
@@ -61,7 +61,7 @@
session2.resumeWrite();
} catch (RuntimeIoException e) {
// Connect failed
- session.close();
+ session.close(true);
} finally {
session.resumeRead();
session.resumeWrite();
Modified: mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/reverser/ReverseProtocolHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/reverser/ReverseProtocolHandler.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/reverser/ReverseProtocolHandler.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/reverser/ReverseProtocolHandler.java Sun Nov 9 14:33:00 2008
@@ -33,7 +33,7 @@
@Override
public void exceptionCaught(IoSession session, Throwable cause) {
// Close connection when unexpected exception is caught.
- session.close();
+ session.close(true);
}
@Override
Modified: mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java Sun Nov 9 14:33:00 2008
@@ -73,19 +73,19 @@
if (rm.getSequence() == values.length - 1) {
// print the sum and disconnect.
logger.info("The sum: " + rm.getValue());
- session.close();
+ session.close(true);
finished = true;
}
} else {
// seever returned error code because of overflow, etc.
logger.warn("Server error, disconnecting...");
- session.close();
+ session.close(true);
finished = true;
}
}
@Override
public void exceptionCaught(IoSession session, Throwable cause) {
- session.close();
+ session.close(true);
}
}
\ No newline at end of file
Modified: mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java Sun Nov 9 14:33:00 2008
@@ -83,12 +83,12 @@
public void sessionIdle(IoSession session, IdleStatus status) {
logger.info("Disconnecting the idle.");
// disconnect an idle client
- session.close();
+ session.close(true);
}
@Override
public void exceptionCaught(IoSession session, Throwable cause) {
// close the connection on exceptional situation
- session.close();
+ session.close(true);
}
}
\ No newline at end of file
Modified: mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/tapedeck/AuthenticationHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/tapedeck/AuthenticationHandler.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/tapedeck/AuthenticationHandler.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/tapedeck/AuthenticationHandler.java Sun Nov 9 14:33:00 2008
@@ -117,7 +117,7 @@
@IoFilterTransition(on = EXCEPTION_CAUGHT, in = ROOT, weight = 10)
public void exceptionCaught(IoSession session, Exception e) {
e.printStackTrace();
- session.close();
+ session.close(true);
}
//
Modified: mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/tapedeck/TapeDeckServer.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/tapedeck/TapeDeckServer.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/tapedeck/TapeDeckServer.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/tapedeck/TapeDeckServer.java Sun Nov 9 14:33:00 2008
@@ -137,7 +137,7 @@
@IoHandlerTransition(on = EXCEPTION_CAUGHT, in = ROOT, weight = 10)
public void exceptionCaught(IoSession session, Exception e) {
e.printStackTrace();
- session.close();
+ session.close(true);
}
@IoHandlerTransition(in = ROOT, weight = 100)
Modified: mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/tennis/TennisPlayer.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/tennis/TennisPlayer.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/tennis/TennisPlayer.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/tennis/TennisPlayer.java Sun Nov 9 14:33:00 2008
@@ -60,7 +60,7 @@
} else {
// If the ball is dead, this player loses.
System.out.println("Player-" + id + ": LOSE");
- session.close();
+ session.close(true);
}
}
@@ -72,6 +72,6 @@
@Override
public void exceptionCaught(IoSession session, Throwable cause) {
cause.printStackTrace();
- session.close();
+ session.close(true);
}
}
\ No newline at end of file
Modified: mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/udp/MemoryMonitorHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/udp/MemoryMonitorHandler.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/udp/MemoryMonitorHandler.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/udp/MemoryMonitorHandler.java Sun Nov 9 14:33:00 2008
@@ -45,7 +45,7 @@
public void exceptionCaught(IoSession session, Throwable cause)
throws Exception {
cause.printStackTrace();
- session.close();
+ session.close(true);
}
@Override
Modified: mina/sandbox/jvermillard/mina-cleaning/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java Sun Nov 9 14:33:00 2008
@@ -164,7 +164,7 @@
testConnector0(session);
}
- session.close().awaitUninterruptibly();
+ session.close(true).awaitUninterruptibly();
}
private void testConnector0(IoSession session) throws InterruptedException {
Modified: mina/sandbox/jvermillard/mina-cleaning/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java Sun Nov 9 14:33:00 2008
@@ -164,7 +164,7 @@
sentMessages.add(message.toString());
System.out.println(message);
if (sentMessages.size() >= 2) {
- session.close();
+ session.close(true);
}
}
}
Modified: mina/sandbox/jvermillard/mina-cleaning/example/src/test/java/org/apache/mina/example/proxy/ClientSessionHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/example/src/test/java/org/apache/mina/example/proxy/ClientSessionHandler.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/example/src/test/java/org/apache/mina/example/proxy/ClientSessionHandler.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/example/src/test/java/org/apache/mina/example/proxy/ClientSessionHandler.java Sun Nov 9 14:33:00 2008
@@ -162,6 +162,6 @@
public void exceptionCaught(IoSession session, Throwable cause) {
logger.debug("CLIENT - Exception caught");
cause.printStackTrace();
- session.close();
+ session.close(true);
}
}
\ No newline at end of file
Modified: mina/sandbox/jvermillard/mina-cleaning/example/src/test/java/org/apache/mina/example/proxy/telnet/TelnetSessionHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/example/src/test/java/org/apache/mina/example/proxy/telnet/TelnetSessionHandler.java?rev=712577&r1=712576&r2=712577&view=diff
==============================================================================
--- mina/sandbox/jvermillard/mina-cleaning/example/src/test/java/org/apache/mina/example/proxy/telnet/TelnetSessionHandler.java (original)
+++ mina/sandbox/jvermillard/mina-cleaning/example/src/test/java/org/apache/mina/example/proxy/telnet/TelnetSessionHandler.java Sun Nov 9 14:33:00 2008
@@ -76,7 +76,7 @@
}
}
- _session.close();
+ _session.close(true);
}
}).start();
@@ -105,6 +105,6 @@
public void exceptionCaught(IoSession session, Throwable cause) {
logger.debug("CLIENT - Exception caught");
cause.printStackTrace();
- session.close();
+ session.close(true);
}
}
\ No newline at end of file