Return-Path: Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org Received: (qmail 1279 invoked from network); 14 Aug 2002 17:04:51 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 14 Aug 2002 17:04:50 -0000 Received: (qmail 28313 invoked by uid 97); 14 Aug 2002 17:04:45 -0000 Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org Received: (qmail 28220 invoked by uid 97); 14 Aug 2002 17:04:44 -0000 Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Avalon CVS List" Reply-To: "Avalon Developers List" Delivered-To: mailing list avalon-cvs@jakarta.apache.org Received: (qmail 28147 invoked by uid 97); 14 Aug 2002 17:04:43 -0000 X-Antivirus: nagoya (v4198 created Apr 24 2002) Date: 14 Aug 2002 17:04:12 -0000 Message-ID: <20020814170412.54800.qmail@icarus.apache.org> From: bloritsch@apache.org To: jakarta-avalon-excalibur-cvs@apache.org Subject: cvs commit: jakarta-avalon-excalibur/event/src/java/org/apache/excalibur/mpool BlockingFixedSizePool.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N bloritsch 2002/08/14 10:04:12 Modified: event/src/java/org/apache/excalibur/mpool BlockingFixedSizePool.java Log: fix bug 11694 and protect from forwarding a BufferUnderflowException Revision Changes Path 1.3 +7 -3 jakarta-avalon-excalibur/event/src/java/org/apache/excalibur/mpool/BlockingFixedSizePool.java Index: BlockingFixedSizePool.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/event/src/java/org/apache/excalibur/mpool/BlockingFixedSizePool.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- BlockingFixedSizePool.java 14 Aug 2002 16:59:55 -0000 1.2 +++ BlockingFixedSizePool.java 14 Aug 2002 17:04:11 -0000 1.3 @@ -51,6 +51,7 @@ import org.apache.avalon.excalibur.concurrent.Mutex; import org.apache.avalon.excalibur.collections.Buffer; +import org.apache.avalon.excalibur.collections.BufferUnderflowException; import org.apache.avalon.excalibur.collections.FixedSizeBuffer; import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.activity.Initializable; @@ -156,12 +157,15 @@ } } while ( m_buffer.isEmpty() ); } + } + try + { object = m_buffer.remove(); } - else + catch (BufferUnderflowException bufe) { - object = m_buffer.remove(); + // ignore exception and leave object as null } } -- To unsubscribe, e-mail: For additional commands, e-mail: