Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 52166 invoked from network); 13 Sep 2006 02:57:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 13 Sep 2006 02:57:58 -0000 Received: (qmail 30381 invoked by uid 500); 13 Sep 2006 02:57:58 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 30345 invoked by uid 500); 13 Sep 2006 02:57:58 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 30334 invoked by uid 99); 13 Sep 2006 02:57:58 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Sep 2006 19:57:58 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Sep 2006 19:57:57 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 6D3811A981A; Tue, 12 Sep 2006 19:57:31 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@directory.apache.org From: trustin@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060913025731.6D3811A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 )