Return-Path: X-Original-To: apmail-commons-dev-archive@www.apache.org Delivered-To: apmail-commons-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B28799EA3 for ; Tue, 1 May 2012 09:46:51 +0000 (UTC) Received: (qmail 33410 invoked by uid 500); 1 May 2012 09:46:50 -0000 Delivered-To: apmail-commons-dev-archive@commons.apache.org Received: (qmail 33302 invoked by uid 500); 1 May 2012 09:46:50 -0000 Mailing-List: contact dev-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Commons Developers List" Delivered-To: mailing list dev@commons.apache.org Received: (qmail 33291 invoked by uid 99); 1 May 2012 09:46:50 -0000 Received: from minotaur.apache.org (HELO minotaur.apache.org) (140.211.11.9) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 May 2012 09:46:50 +0000 Received: from localhost (HELO [192.168.23.9]) (127.0.0.1) (smtp-auth username markt, mechanism plain) by minotaur.apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 May 2012 09:46:50 +0000 Message-ID: <4F9FB106.7080000@apache.org> Date: Tue, 01 May 2012 10:46:46 +0100 From: Mark Thomas User-Agent: Mozilla/5.0 (Windows NT 5.2; WOW64; rv:12.0) Gecko/20120420 Thunderbird/12.0 MIME-Version: 1.0 To: Commons Developers List Subject: Re: svn commit: r1332588 - in /commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl: BaseGenericObjectPool.java GenericKeyedObjectPool.java GenericObjectPool.java References: <20120501092536.628AB2388962@eris.apache.org> In-Reply-To: X-Enigmail-Version: 1.4.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit On 01/05/2012 10:44, sebb wrote: > On 1 May 2012 10:25, wrote: >> Author: markt >> Date: Tue May 1 09:25:35 2012 >> New Revision: 1332588 >> >> URL: http://svn.apache.org/viewvc?rev=1332588&view=rev >> Log: >> Refactor so the Javadoc for GKOP doesn't point to GOP. > > The Javadoc originally referred to a missing method, so I changed it > to use an interface of BGOP, which is inherited by GOP and GKOP. > > Not sure how that can have resulted in GKOP referencing GOP? I don't > see that at all. > > I'm only curious about the log comment; the actual change is fine. That is what I get for (mis) reading the diff on my phone. Mark > >> Modified: >> commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java >> commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java >> commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java >> >> Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java >> URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java?rev=1332588&r1=1332587&r2=1332588&view=diff >> ============================================================================== >> --- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java (original) >> +++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java Tue May 1 09:25:35 2012 >> @@ -397,7 +397,7 @@ public abstract class BaseGenericObjectP >> * of the idle object evictor thread. When positive, the number of tests >> * performed for a run will be the minimum of the configured value and the >> * number of idle instances in the pool. When negative, the number of tests >> - * performed will be ceil({@link org.apache.commons.pool2.ObjectPool#getNumIdle #getNumIdle}/ >> + * performed will be ceil({@link #getNumIdle}/ >> * abs({@link #getNumTestsPerEvictionRun})) whch means that when the value >> * is -n roughly one nth of the idle objects will be tested per >> * run. >> @@ -416,7 +416,7 @@ public abstract class BaseGenericObjectP >> * of the idle object evictor thread. When positive, the number of tests >> * performed for a run will be the minimum of the configured value and the >> * number of idle instances in the pool. When negative, the number of tests >> - * performed will be ceil({@link org.apache.commons.pool2.ObjectPool#getNumIdle() #getNumIdle()}/ >> + * performed will be ceil({@link #getNumIdle}/ >> * abs({@link #getNumTestsPerEvictionRun})) whch means that when the value >> * is -n roughly one nth of the idle objects will be tested per >> * run. >> @@ -737,6 +737,11 @@ public abstract class BaseGenericObjectP >> return maxBorrowWaitTimeMillis; >> } >> >> + /** >> + * The number of instances currently idle in this pool. >> + */ >> + public abstract int getNumIdle(); >> + >> final NotificationBroadcasterSupport getJmxNotificationSupport() { >> return jmxNotificationSupport; >> } >> >> Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java >> URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java?rev=1332588&r1=1332587&r2=1332588&view=diff >> ============================================================================== >> --- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java (original) >> +++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java Tue May 1 09:25:35 2012 >> @@ -743,11 +743,6 @@ public class GenericKeyedObjectPool >> return numTotal.get() - getNumIdle(); >> } >> >> - /** >> - * Returns the total number of instances currently idle in this pool. >> - * >> - * @return the total number of instances currently idle in this pool >> - */ >> @Override >> public int getNumIdle() { >> Iterator> iter = poolMap.values().iterator(); >> >> Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java >> URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java?rev=1332588&r1=1332587&r2=1332588&view=diff >> ============================================================================== >> --- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java (original) >> +++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java Tue May 1 09:25:35 2012 >> @@ -630,11 +630,6 @@ public class GenericObjectPool extend >> return allObjects.size() - idleObjects.size(); >> } >> >> - /** >> - * Return the number of instances currently idle in this pool. >> - * >> - * @return the number of instances currently idle in this pool >> - */ >> @Override >> public int getNumIdle() { >> return idleObjects.size(); >> >> > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org > For additional commands, e-mail: dev-help@commons.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org For additional commands, e-mail: dev-help@commons.apache.org