Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 50377 invoked from network); 9 Aug 2006 08:47:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 9 Aug 2006 08:47:55 -0000 Received: (qmail 13887 invoked by uid 500); 9 Aug 2006 08:47:54 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 13836 invoked by uid 500); 9 Aug 2006 08:47:54 -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 13824 invoked by uid 99); 9 Aug 2006 08:47:54 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Aug 2006 01:47:54 -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; Wed, 09 Aug 2006 01:47:53 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 7FC411A981A; Wed, 9 Aug 2006 01:47:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r429997 - in /directory/trunks/mina/core/src/main/java/org/apache/mina: common/IoFilter.java common/PooledThreadModel.java common/ReferenceCountingIoFilter.java filter/ReferenceCountingIoFilter.java Date: Wed, 09 Aug 2006 08:47:32 -0000 To: commits@directory.apache.org From: trustin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060809084733.7FC411A981A@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: Wed Aug 9 01:47:32 2006 New Revision: 429997 URL: http://svn.apache.org/viewvc?rev=429997&view=rev Log: Fixed a deadlock caused by ReferenceCountingIoFilter in PooledThreadModel Added: directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ReferenceCountingIoFilter.java (contents, props changed) - copied, changed from r429983, directory/trunks/mina/core/src/main/java/org/apache/mina/common/ReferenceCountingIoFilter.java Removed: directory/trunks/mina/core/src/main/java/org/apache/mina/common/ReferenceCountingIoFilter.java Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoFilter.java directory/trunks/mina/core/src/main/java/org/apache/mina/common/PooledThreadModel.java Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoFilter.java URL: http://svn.apache.org/viewvc/directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoFilter.java?rev=429997&r1=429996&r2=429997&view=diff ============================================================================== --- directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoFilter.java (original) +++ directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoFilter.java Wed Aug 9 01:47:32 2006 @@ -20,6 +20,8 @@ import java.net.SocketAddress; +import org.apache.mina.filter.ReferenceCountingIoFilter; + /** * A filter which intercepts {@link IoHandler} events like Servlet * filters. Filters can be used for these purposes: Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/common/PooledThreadModel.java URL: http://svn.apache.org/viewvc/directory/trunks/mina/core/src/main/java/org/apache/mina/common/PooledThreadModel.java?rev=429997&r1=429996&r2=429997&view=diff ============================================================================== --- directory/trunks/mina/core/src/main/java/org/apache/mina/common/PooledThreadModel.java (original) +++ directory/trunks/mina/core/src/main/java/org/apache/mina/common/PooledThreadModel.java Wed Aug 9 01:47:32 2006 @@ -85,7 +85,6 @@ } private final ThreadPoolFilter filter = new ThreadPoolFilter(); - private final IoFilter proxy = new ReferenceCountingIoFilter( filter ); private PooledThreadModel( String threadNamePrefix ) { @@ -130,6 +129,6 @@ public void buildFilterChain( IoFilterChain chain ) throws Exception { - chain.addFirst( PooledThreadModel.class.getName(), proxy ); + chain.addFirst( PooledThreadModel.class.getName(), filter ); } } Copied: directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ReferenceCountingIoFilter.java (from r429983, directory/trunks/mina/core/src/main/java/org/apache/mina/common/ReferenceCountingIoFilter.java) URL: http://svn.apache.org/viewvc/directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ReferenceCountingIoFilter.java?p2=directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ReferenceCountingIoFilter.java&p1=directory/trunks/mina/core/src/main/java/org/apache/mina/common/ReferenceCountingIoFilter.java&r1=429983&r2=429997&rev=429997&view=diff ============================================================================== --- directory/trunks/mina/core/src/main/java/org/apache/mina/common/ReferenceCountingIoFilter.java (original) +++ directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ReferenceCountingIoFilter.java Wed Aug 9 01:47:32 2006 @@ -16,7 +16,12 @@ * limitations under the License. * */ -package org.apache.mina.common; +package org.apache.mina.filter; + +import org.apache.mina.common.IdleStatus; +import org.apache.mina.common.IoFilter; +import org.apache.mina.common.IoFilterChain; +import org.apache.mina.common.IoSession; /** Propchange: directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ReferenceCountingIoFilter.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ReferenceCountingIoFilter.java ------------------------------------------------------------------------------ svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision