Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 75196 invoked from network); 10 Nov 2004 21:51:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 10 Nov 2004 21:51:43 -0000 Received: (qmail 65154 invoked by uid 500); 10 Nov 2004 21:51:42 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 65102 invoked by uid 500); 10 Nov 2004 21:51:42 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 65091 invoked by uid 99); 10 Nov 2004 21:51:41 -0000 X-ASF-Spam-Status: No, hits=-10.0 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.28) with SMTP; Wed, 10 Nov 2004 13:51:41 -0800 Received: (qmail 75165 invoked by uid 65534); 10 Nov 2004 21:51:40 -0000 Date: 10 Nov 2004 21:51:40 -0000 Message-ID: <20041110215140.75161.qmail@minotaur.apache.org> From: giacomo@apache.org To: cvs@cocoon.apache.org Subject: svn commit: rev 57386 - cocoon/trunk/src/java/org/apache/cocoon/components/thread X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: giacomo Date: Wed Nov 10 13:51:40 2004 New Revision: 57386 Modified: cocoon/trunk/src/java/org/apache/cocoon/components/thread/BoundedQueue.java cocoon/trunk/src/java/org/apache/cocoon/components/thread/LinkedQueue.java cocoon/trunk/src/java/org/apache/cocoon/components/thread/ThreadPool.java Log: fixing possible race condition Modified: cocoon/trunk/src/java/org/apache/cocoon/components/thread/BoundedQueue.java ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/components/thread/BoundedQueue.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/components/thread/BoundedQueue.java Wed Nov 10 13:51:40 2004 @@ -59,7 +59,7 @@ /** * DOCUMENT ME! * - * @return + * @return */ public int getQueueSize( ) { Modified: cocoon/trunk/src/java/org/apache/cocoon/components/thread/LinkedQueue.java ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/components/thread/LinkedQueue.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/components/thread/LinkedQueue.java Wed Nov 10 13:51:40 2004 @@ -32,11 +32,6 @@ extends EDU.oswego.cs.dl.util.concurrent.LinkedQueue implements Queue { - //~ Instance fields -------------------------------------------------------- - - /** The size */ - protected int m_size = 0; - //~ Methods ---------------------------------------------------------------- /** @@ -44,31 +39,6 @@ */ public int getQueueSize( ) { - return m_size; - } - - /** - * @see EDU.oswego.cs.dl.util.concurrent.LinkedQueue#extract() - */ - protected synchronized Object extract( ) - { - synchronized( head_ ) - { - if( head_.next != null ) - { - --m_size; - } - - return super.extract( ); - } - } - - /** - * @see EDU.oswego.cs.dl.util.concurrent.LinkedQueue#insert(java.lang.Object) - */ - protected void insert( final Object object ) - { - super.insert( object ); - ++m_size; + return -1; } } Modified: cocoon/trunk/src/java/org/apache/cocoon/components/thread/ThreadPool.java ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/components/thread/ThreadPool.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/components/thread/ThreadPool.java Wed Nov 10 13:51:40 2004 @@ -20,7 +20,7 @@ * of a pool of threads * * @author Giacomo Pati - * @version CVS $Id: ThreadPool.java,v 1.1 2004/06/16 14:39:21 giacomo Exp $ + * @version CVS $Id$ */ public interface ThreadPool { @@ -104,9 +104,10 @@ int getPriority( ); /** - * Current size of the queue + * Current size of the queue. * - * @return current size of queue + * @return current size of queue. If the size of the queue is not + * maintained by an implementation -1 should be returned. */ int getQueueSize( );