directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r442804 - /directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
Date Wed, 13 Sep 2006 02:57:31 GMT
Author: trustin
Date: Tue Sep 12 19:57:30 2006
New Revision: 442804

URL: http://svn.apache.org/viewvc?view=rev&rev=442804
Log:
Resolved issue: DIRMINA-261 (ioSession.close().join() when SO_LINGERING set
* Disabled SO_LINGER just before closing a session

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=442804&r1=442803&r2=442804
==============================================================================
--- 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
Tue Sep 12 19:57:30 2006
@@ -214,6 +214,10 @@
             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