directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r454281 - in /directory: branches/mina/0.8/src/main/java/org/apache/mina/io/socket/ branches/mina/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/ trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/
Date Mon, 09 Oct 2006 04:28:00 GMT
Author: trustin
Date: Sun Oct  8 21:27:59 2006
New Revision: 454281

URL: http://svn.apache.org/viewvc?view=rev&rev=454281
Log:
Fixed issue: DIRMINA-275 (Exception in thread "SocketAcceptor-1" java.nio.channels.CancelledKeyException)
* Reordered I/O handler invocations


Modified:
    directory/branches/mina/0.8/src/main/java/org/apache/mina/io/socket/SocketAcceptor.java
    directory/branches/mina/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
    directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java

Modified: directory/branches/mina/0.8/src/main/java/org/apache/mina/io/socket/SocketAcceptor.java
URL: http://svn.apache.org/viewvc/directory/branches/mina/0.8/src/main/java/org/apache/mina/io/socket/SocketAcceptor.java?view=diff&rev=454281&r1=454280&r2=454281
==============================================================================
--- directory/branches/mina/0.8/src/main/java/org/apache/mina/io/socket/SocketAcceptor.java
(original)
+++ directory/branches/mina/0.8/src/main/java/org/apache/mina/io/socket/SocketAcceptor.java
Sun Oct  8 21:27:59 2006
@@ -237,12 +237,13 @@
                     int nKeys = selector.select();
 
                     registerNew();
-                    cancelKeys();
 
                     if( nKeys > 0 )
                     {
                         processSessions( selector.selectedKeys() );
                     }
+
+                    cancelKeys();
 
                     if( selector.keys().isEmpty() )
                     {

Modified: directory/branches/mina/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
URL: http://svn.apache.org/viewvc/directory/branches/mina/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java?view=diff&rev=454281&r1=454280&r2=454281
==============================================================================
--- directory/branches/mina/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
(original)
+++ directory/branches/mina/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
Sun Oct  8 21:27:59 2006
@@ -266,12 +266,13 @@
                     int nKeys = selector.select();
 
                     registerNew();
-                    cancelKeys();
 
                     if( nKeys > 0 )
                     {
                         processSessions( selector.selectedKeys() );
                     }
+
+                    cancelKeys();
 
                     if( selector.keys().isEmpty() )
                     {

Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
URL: http://svn.apache.org/viewvc/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java?view=diff&rev=454281&r1=454280&r2=454281
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
(original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
Sun Oct  8 21:27:59 2006
@@ -266,12 +266,13 @@
                     int nKeys = selector.select();
 
                     registerNew();
-                    cancelKeys();
 
                     if( nKeys > 0 )
                     {
                         processSessions( selector.selectedKeys() );
                     }
+
+                    cancelKeys();
 
                     if( selector.keys().isEmpty() )
                     {



Mime
View raw message