Author: trustin
Date: Thu Sep 27 06:03:35 2007
New Revision: 579998
URL: http://svn.apache.org/viewvc?rev=579998&view=rev
Log:
* Fixed failing traffic control tests
* Enabled previously disabled tests
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoProcessor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioProcessor.java
mina/trunk/pom.xml
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoProcessor.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoProcessor.java?rev=579998&r1=579997&r2=579998&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoProcessor.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoProcessor.java
Thu Sep 27 06:03:35 2007
@@ -541,20 +541,17 @@
case OPEN:
// The normal is OP_READ and, if there are write requests in
the
// session's write queue, set OP_WRITE to trigger flushing.
- int ops = SelectionKey.OP_READ;
- if (!session.getWriteRequestQueue().isEmpty()) {
- ops |= SelectionKey.OP_WRITE;
- }
-
- // Now mask the preferred ops with the mask of the current
session
int mask = session.getTrafficMask().getInterestOps();
try {
- setOpRead(session, isOpRead(session) && ((mask &
SelectionKey.OP_READ) != 0));
+ setOpRead(session, (mask & SelectionKey.OP_READ) != 0);
} catch (Exception e) {
session.getFilterChain().fireExceptionCaught(e);
}
try {
- setOpWrite(session, isOpWrite(session) && ((mask &
SelectionKey.OP_WRITE) != 0));
+ setOpWrite(
+ session,
+ !session.getWriteRequestQueue().isEmpty() &&
+ ((mask & SelectionKey.OP_WRITE) != 0));
} catch (Exception e) {
session.getFilterChain().fireExceptionCaught(e);
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioProcessor.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioProcessor.java?rev=579998&r1=579997&r2=579998&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioProcessor.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioProcessor.java
Thu Sep 27 06:03:35 2007
@@ -140,7 +140,7 @@
if (value) {
key.interestOps(key.interestOps() | SelectionKey.OP_READ);
} else {
- key.interestOps(key.interestOps() & ~SelectionKey.OP_READ);
+ key.interestOps(key.interestOps() & (~SelectionKey.OP_READ));
}
}
@@ -151,7 +151,7 @@
if (value) {
key.interestOps(key.interestOps() | SelectionKey.OP_WRITE);
} else {
- key.interestOps(key.interestOps() & ~SelectionKey.OP_WRITE);
+ key.interestOps(key.interestOps() & (~SelectionKey.OP_WRITE));
}
}
Modified: mina/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/pom.xml?rev=579998&r1=579997&r2=579998&view=diff
==============================================================================
--- mina/trunk/pom.xml (original)
+++ mina/trunk/pom.xml Thu Sep 27 06:03:35 2007
@@ -121,8 +121,9 @@
<exclude>**/Abstract*</exclude>
<!-- Timing issues with these tests due to VM bug for releasing
file descriptors -->
+<!--
<exclude>**/DatagramBindTest.java</exclude>
- <exclude>**/VmPipeTrafficControlTest.java</exclude>
+-->
<exclude>**/*RegressionTest*</exclude>
</excludes>
