Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 26158 invoked from network); 12 Mar 2006 03:43:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Mar 2006 03:43:20 -0000 Received: (qmail 4604 invoked by uid 500); 12 Mar 2006 03:43:20 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 4556 invoked by uid 500); 12 Mar 2006 03:43:19 -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 4545 invoked by uid 99); 12 Mar 2006 03:43:19 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Mar 2006 19:43:19 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 11 Mar 2006 19:43:19 -0800 Received: (qmail 26062 invoked by uid 65534); 12 Mar 2006 03:42:58 -0000 Message-ID: <20060312034258.26061.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r385241 - in /directory/trunks/mina/core/src: main/java/org/apache/mina/filter/ThreadPoolFilter.java test/java/org/apache/mina/common/ByteBufferTest.java test/java/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java Date: Sun, 12 Mar 2006 03:42:58 -0000 To: commits@directory.apache.org From: trustin@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: trustin Date: Sat Mar 11 19:42:56 2006 New Revision: 385241 URL: http://svn.apache.org/viewcvs?rev=385241&view=rev Log: * Fixed failing regression test cases * Shortend ByteBufferTest duration Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ThreadPoolFilter.java directory/trunks/mina/core/src/test/java/org/apache/mina/common/ByteBufferTest.java directory/trunks/mina/core/src/test/java/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ThreadPoolFilter.java URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ThreadPoolFilter.java?rev=385241&r1=385240&r2=385241&view=diff ============================================================================== --- directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ThreadPoolFilter.java (original) +++ directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ThreadPoolFilter.java Sat Mar 11 19:42:56 2006 @@ -306,17 +306,14 @@ private SessionBuffer getSessionBuffer( IoSession session ) { final Map buffers = this.buffers; - SessionBuffer buf = ( SessionBuffer ) buffers.get( session ); - if( buf == null ) + SessionBuffer buf; + synchronized( buffers ) { - synchronized( buffers ) + buf = ( SessionBuffer ) buffers.get( session ); + if( buf == null ) { - buf = ( SessionBuffer ) buffers.get( session ); - if( buf == null ) - { - buf = new SessionBuffer( session ); - buffers.put( session, buf ); - } + buf = new SessionBuffer( session ); + buffers.put( session, buf ); } } return buf; Modified: directory/trunks/mina/core/src/test/java/org/apache/mina/common/ByteBufferTest.java URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/test/java/org/apache/mina/common/ByteBufferTest.java?rev=385241&r1=385240&r2=385241&view=diff ============================================================================== --- directory/trunks/mina/core/src/test/java/org/apache/mina/common/ByteBufferTest.java (original) +++ directory/trunks/mina/core/src/test/java/org/apache/mina/common/ByteBufferTest.java Sat Mar 11 19:42:56 2006 @@ -481,7 +481,14 @@ t.setDaemon( true ); t.start(); - Thread.sleep( 5 * 1000 ); + for( int i = 0; i < 50; i ++ ) + { + Thread.sleep( 100 ); + if( !t.isAlive() ) + { + break; + } + } if( t.isAlive() ) { Modified: directory/trunks/mina/core/src/test/java/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/test/java/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java?rev=385241&r1=385240&r2=385241&view=diff ============================================================================== --- directory/trunks/mina/core/src/test/java/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java (original) +++ directory/trunks/mina/core/src/test/java/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java Sat Mar 11 19:42:56 2006 @@ -40,12 +40,12 @@ public void setUp() throws Exception { filter = new ThreadPoolFilter(); - filter.init(); + filter.start(); } public void tearDown() throws Exception { - filter.destroy(); + filter.stop(); Assert.assertEquals( 0, filter.getPoolSize() ); filter = null; }