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/14 10:27:24 UTC
svn commit: r713957 [2/2] - in /mina/trunk:
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/polling/
core/src/main/java/org/apache/mina/core/service/ core/src/...
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/client/ImageClient.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/client/ImageClient.java?rev=713957&r1=713956&r2=713957&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/client/ImageClient.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/client/ImageClient.java Fri Nov 14 01:27:16 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/trunk/example/src/main/java/org/apache/mina/example/netcat/NetCatProtocolHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/netcat/NetCatProtocolHandler.java?rev=713957&r1=713956&r2=713957&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/netcat/NetCatProtocolHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/netcat/NetCatProtocolHandler.java Fri Nov 14 01:27:16 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/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java?rev=713957&r1=713956&r2=713957&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java Fri Nov 14 01:27:16 2008
@@ -24,7 +24,6 @@
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.session.IoSession;
-import org.apache.mina.core.session.TrafficMask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +43,8 @@
@Override
public void sessionCreated(IoSession session) throws Exception {
- session.setTrafficMask(TrafficMask.NONE);
+ session.suspendRead();
+ session.suspendWrite();
}
@Override
@@ -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/trunk/example/src/main/java/org/apache/mina/example/proxy/ClientToProxyIoHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/proxy/ClientToProxyIoHandler.java?rev=713957&r1=713956&r2=713957&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/proxy/ClientToProxyIoHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/proxy/ClientToProxyIoHandler.java Fri Nov 14 01:27:16 2008
@@ -26,7 +26,6 @@
import org.apache.mina.core.future.IoFutureListener;
import org.apache.mina.core.service.IoConnector;
import org.apache.mina.core.session.IoSession;
-import org.apache.mina.core.session.TrafficMask;
/**
* Handles the client to proxy part of the proxied connection.
@@ -57,12 +56,15 @@
try {
future.getSession().setAttribute(OTHER_IO_SESSION, session);
session.setAttribute(OTHER_IO_SESSION, future.getSession());
- future.getSession().setTrafficMask(TrafficMask.ALL);
+ IoSession session2 = future.getSession();
+ session2.resumeRead();
+ session2.resumeWrite();
} catch (RuntimeIoException e) {
// Connect failed
- session.close();
+ session.close(true);
} finally {
- session.setTrafficMask(TrafficMask.ALL);
+ session.resumeRead();
+ session.resumeWrite();
}
}
});
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/reverser/ReverseProtocolHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/reverser/ReverseProtocolHandler.java?rev=713957&r1=713956&r2=713957&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/reverser/ReverseProtocolHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/reverser/ReverseProtocolHandler.java Fri Nov 14 01:27:16 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/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java?rev=713957&r1=713956&r2=713957&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java Fri Nov 14 01:27:16 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/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java?rev=713957&r1=713956&r2=713957&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java Fri Nov 14 01:27:16 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/trunk/example/src/main/java/org/apache/mina/example/tapedeck/AuthenticationHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/tapedeck/AuthenticationHandler.java?rev=713957&r1=713956&r2=713957&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/tapedeck/AuthenticationHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/tapedeck/AuthenticationHandler.java Fri Nov 14 01:27:16 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/trunk/example/src/main/java/org/apache/mina/example/tapedeck/TapeDeckServer.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/tapedeck/TapeDeckServer.java?rev=713957&r1=713956&r2=713957&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/tapedeck/TapeDeckServer.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/tapedeck/TapeDeckServer.java Fri Nov 14 01:27:16 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/trunk/example/src/main/java/org/apache/mina/example/tennis/TennisPlayer.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/tennis/TennisPlayer.java?rev=713957&r1=713956&r2=713957&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/tennis/TennisPlayer.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/tennis/TennisPlayer.java Fri Nov 14 01:27:16 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/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitorHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitorHandler.java?rev=713957&r1=713956&r2=713957&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitorHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitorHandler.java Fri Nov 14 01:27:16 2008
@@ -45,7 +45,7 @@
public void exceptionCaught(IoSession session, Throwable cause)
throws Exception {
cause.printStackTrace();
- session.close();
+ session.close(true);
}
@Override
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java?rev=713957&r1=713956&r2=713957&view=diff
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java Fri Nov 14 01:27:16 2008
@@ -164,7 +164,7 @@
testConnector0(session);
}
- session.close().awaitUninterruptibly();
+ session.close(true).awaitUninterruptibly();
}
private void testConnector0(IoSession session) throws InterruptedException {
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java?rev=713957&r1=713956&r2=713957&view=diff
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java Fri Nov 14 01:27:16 2008
@@ -167,7 +167,7 @@
sentMessages.add(message.toString());
System.out.println(message);
if (sentMessages.size() >= 2) {
- session.close();
+ session.close(true);
}
}
}
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/proxy/ClientSessionHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/proxy/ClientSessionHandler.java?rev=713957&r1=713956&r2=713957&view=diff
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/proxy/ClientSessionHandler.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/proxy/ClientSessionHandler.java Fri Nov 14 01:27:16 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/trunk/example/src/test/java/org/apache/mina/example/proxy/telnet/TelnetSessionHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/proxy/telnet/TelnetSessionHandler.java?rev=713957&r1=713956&r2=713957&view=diff
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/proxy/telnet/TelnetSessionHandler.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/proxy/telnet/TelnetSessionHandler.java Fri Nov 14 01:27:16 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
Modified: mina/trunk/integration-xbean/src/main/java/org/apache/mina/integration/xbean/MinaPropertyEditorRegistrar.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-xbean/src/main/java/org/apache/mina/integration/xbean/MinaPropertyEditorRegistrar.java?rev=713957&r1=713956&r2=713957&view=diff
==============================================================================
--- mina/trunk/integration-xbean/src/main/java/org/apache/mina/integration/xbean/MinaPropertyEditorRegistrar.java (original)
+++ mina/trunk/integration-xbean/src/main/java/org/apache/mina/integration/xbean/MinaPropertyEditorRegistrar.java Fri Nov 14 01:27:16 2008
@@ -25,11 +25,8 @@
import java.net.InetSocketAddress;
import java.net.SocketAddress;
-import org.apache.mina.core.session.TrafficMask;
-import org.apache.mina.integration.beans.BooleanEditor;
import org.apache.mina.integration.beans.InetAddressEditor;
import org.apache.mina.integration.beans.InetSocketAddressEditor;
-import org.apache.mina.integration.beans.TrafficMaskEditor;
import org.apache.mina.integration.beans.VmPipeAddressEditor;
import org.apache.mina.transport.vmpipe.VmPipeAddress;
import org.springframework.beans.PropertyEditorRegistrar;
@@ -72,7 +69,6 @@
registry.registerCustomEditor( InetAddress.class, new InetAddressEditor() );
registry.registerCustomEditor( InetSocketAddress.class, new InetSocketAddressEditor() );
registry.registerCustomEditor( SocketAddress.class, new InetSocketAddressEditor() );
- registry.registerCustomEditor( TrafficMask.class, new TrafficMaskEditor() );
registry.registerCustomEditor( VmPipeAddress.class, new VmPipeAddressEditor() );
// registry.registerCustomEditor( Boolean.class, new BooleanEditor() );
}
Modified: mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java?rev=713957&r1=713956&r2=713957&view=diff
==============================================================================
--- mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java (original)
+++ mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java Fri Nov 14 01:27:16 2008
@@ -49,6 +49,8 @@
*/
public final class SerialConnector extends AbstractIoConnector {
private final Logger log;
+
+ private IdleStatusChecker idleChecker;
public SerialConnector() {
this(null);
@@ -57,6 +59,12 @@
public SerialConnector(Executor executor) {
super(new DefaultSerialSessionConfig(), executor);
log = LoggerFactory.getLogger(SerialConnector.class);
+
+ idleChecker = new IdleStatusChecker();
+ // we schedule the idle status checking task in this service exceutor
+ // it will be woke up every seconds
+ executeWorker(idleChecker.getNotifyingTask(), "idleStatusChecker");
+
}
@Override
@@ -125,6 +133,8 @@
@Override
protected IoFuture dispose0() throws Exception {
+ // stop the idle checking task
+ idleChecker.getNotifyingTask().cancel();
return null;
}
@@ -171,6 +181,6 @@
}
IdleStatusChecker getIdleStatusChecker0() {
- return super.getIdleStatusChecker();
+ return idleChecker;
}
-}
+}
\ No newline at end of file
Modified: mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionImpl.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionImpl.java?rev=713957&r1=713956&r2=713957&view=diff
==============================================================================
--- mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionImpl.java (original)
+++ mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionImpl.java Fri Nov 14 01:27:16 2008
@@ -277,7 +277,7 @@
serviceListeners.fireSessionDestroyed(SerialSessionImpl.this);
}
- public void updateTrafficMask(SerialSessionImpl session) {
+ public void updateTrafficControl(SerialSessionImpl session) {
throw new UnsupportedOperationException();
}