directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r446581 - /directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
Date Fri, 15 Sep 2006 11:36:14 GMT
Author: trustin
Date: Fri Sep 15 04:36:12 2006
New Revision: 446581

URL: http://svn.apache.org/viewvc?view=rev&rev=446581
Log:
Reverted a wrong fix for DIRMINA-261 (ioSession.close().join() when SO_LINGERING set)

Modified:
    directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java

Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
URL: http://svn.apache.org/viewvc/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java?view=diff&rev=446581&r1=446580&r2=446581
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
(original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
Fri Sep 15 04:36:12 2006
@@ -214,10 +214,6 @@
             try
             {
                 key.cancel();
-                
-                // Disable SO_LINGER which causes the I/O processor to block
-                // too long.
-                ch.socket().setSoLinger( false, 0 );
                 ch.close();
             }
             catch( IOException e )



Mime
View raw message