You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2013/01/04 08:16:28 UTC
svn commit: r1428733 - in
/mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio:
NioSelectorLoop.java NioTcpSession.java
Author: elecharny
Date: Fri Jan 4 07:16:28 2013
New Revision: 1428733
URL: http://svn.apache.org/viewvc?rev=1428733&view=rev
Log:
It's not enough to set the SelectionKey flag OP_WRITE to false when we have just done a write and we don't have anymore to do, we also have to reset the IoSession registeredForWrite flag to false, otherwise we enter into a deadlock.
Modified:
mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioSelectorLoop.java
mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioTcpSession.java
Modified: mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioSelectorLoop.java
URL: http://svn.apache.org/viewvc/mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioSelectorLoop.java?rev=1428733&r1=1428732&r2=1428733&view=diff
==============================================================================
--- mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioSelectorLoop.java (original)
+++ mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioSelectorLoop.java Fri Jan 4 07:16:28 2013
@@ -145,15 +145,19 @@ public class NioSelectorLoop implements
}
int ops = 0;
+
if (accept) {
ops |= SelectionKey.OP_ACCEPT;
}
+
if (read) {
ops |= SelectionKey.OP_READ;
}
+
if (write) {
ops |= SelectionKey.OP_WRITE;
}
+
key.interestOps(ops);
// we need to wakeup for the registration to be modified (TODO : not needed if we are in the worker thread)
Modified: mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioTcpSession.java
URL: http://svn.apache.org/viewvc/mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioTcpSession.java?rev=1428733&r1=1428732&r2=1428733&view=diff
==============================================================================
--- mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioTcpSession.java (original)
+++ mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioTcpSession.java Fri Jan 4 07:16:28 2013
@@ -360,6 +360,9 @@ public class NioTcpSession extends Abstr
} else {
// no more write event needed
selectorLoop.modifyRegistration(false, !isReadSuspended(), false, this, channel);
+
+ // Reset the flag in IoSession too
+ setNotRegisteredForWrite();
}
} else {
// We have some more data to write : the channel OP_WRITE interest remains