Return-Path: Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org Received: (qmail 61871 invoked from network); 16 Mar 2006 08:04:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 16 Mar 2006 08:04:15 -0000 Received: (qmail 46147 invoked by uid 500); 16 Mar 2006 08:04:00 -0000 Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org Received: (qmail 46062 invoked by uid 500); 16 Mar 2006 08:03:59 -0000 Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Jakarta Commons Developers List" Reply-To: "Jakarta Commons Developers List" Delivered-To: mailing list commons-dev@jakarta.apache.org Received: (qmail 46050 invoked by uid 500); 16 Mar 2006 08:03:59 -0000 Received: (qmail 46047 invoked by uid 99); 16 Mar 2006 08:03:59 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Mar 2006 00:03:59 -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; Thu, 16 Mar 2006 00:03:58 -0800 Received: (qmail 61161 invoked by uid 65534); 16 Mar 2006 08:03:38 -0000 Message-ID: <20060316080338.61159.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r386281 - in /jakarta/commons/proper/pool/trunk: src/java/org/apache/commons/pool/impl/ xdocs/ Date: Thu, 16 Mar 2006 08:03:36 -0000 To: commons-cvs@jakarta.apache.org From: sandymac@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: sandymac Date: Thu Mar 16 00:03:28 2006 New Revision: 386281 URL: http://svn.apache.org/viewcvs?rev=386281&view=rev Log: Where there is no factory calling addObject is bogus so throw an IllegalStateExecption. Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericObjectPool.java jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/SoftReferenceObjectPool.java jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/StackObjectPool.java jakarta/commons/proper/pool/trunk/xdocs/changes.xml Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericObjectPool.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericObjectPool.java?rev=386281&r1=386280&r2=386281&view=diff ============================================================================== --- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericObjectPool.java (original) +++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericObjectPool.java Thu Mar 16 00:03:28 2006 @@ -1084,6 +1084,9 @@ */ public synchronized void addObject() throws Exception { assertOpen(); + if (_factory == null) { + throw new IllegalStateException("Cannot add objects without a factory."); + } Object obj = _factory.makeObject(); addObjectToPool(obj, false); } Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/SoftReferenceObjectPool.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/SoftReferenceObjectPool.java?rev=386281&r1=386280&r2=386281&view=diff ============================================================================== --- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/SoftReferenceObjectPool.java (original) +++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/SoftReferenceObjectPool.java Thu Mar 16 00:03:28 2006 @@ -175,6 +175,9 @@ */ public synchronized void addObject() throws Exception { assertOpen(); + if (_factory == null) { + throw new IllegalStateException("Cannot add objects without a factory."); + } Object obj = _factory.makeObject(); boolean success = true; Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java?rev=386281&r1=386280&r2=386281&view=diff ============================================================================== --- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java (original) +++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java Thu Mar 16 00:03:28 2006 @@ -276,14 +276,12 @@ } else { staleObj = obj; } - if(null != _factory) { - try { - _factory.destroyObject(key, staleObj); - } catch (Exception e) { - // Don't swallow destroying the newly created object. - if (obj == staleObj) { - throw e; - } + try { + _factory.destroyObject(key, staleObj); + } catch (Exception e) { + // Don't swallow destroying the newly created object. + if (obj == staleObj) { + throw e; } } } else { Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/StackObjectPool.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/StackObjectPool.java?rev=386281&r1=386280&r2=386281&view=diff ============================================================================== --- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/StackObjectPool.java (original) +++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/StackObjectPool.java Thu Mar 16 00:03:28 2006 @@ -286,12 +286,13 @@ */ public synchronized void addObject() throws Exception { assertOpen(); + if (_factory == null) { + throw new IllegalStateException("Cannot add objects without a factory."); + } Object obj = _factory.makeObject(); boolean success = true; - if(null != _factory) { - _factory.passivateObject(obj); - } + _factory.passivateObject(obj); boolean shouldDestroy = !success; Modified: jakarta/commons/proper/pool/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/xdocs/changes.xml?rev=386281&r1=386280&r2=386281&view=diff ============================================================================== --- jakarta/commons/proper/pool/trunk/xdocs/changes.xml (original) +++ jakarta/commons/proper/pool/trunk/xdocs/changes.xml Thu Mar 16 00:03:28 2006 @@ -22,6 +22,9 @@ + + Where there is no factory calling addObject is bogus so throw an IllegalStateExecption. + Edited all KeyedObjectPool related JavaDocs to have meaningful and correct content. --------------------------------------------------------------------- To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: commons-dev-help@jakarta.apache.org