commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1332588 - in /commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl: BaseGenericObjectPool.java GenericKeyedObjectPool.java GenericObjectPool.java
Date Tue, 01 May 2012 09:25:36 GMT
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.

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 <code>ceil({@link org.apache.commons.pool2.ObjectPool#getNumIdle
#getNumIdle}/
+     * performed will be <code>ceil({@link #getNumIdle}/
      * abs({@link #getNumTestsPerEvictionRun})) whch means that when the value
      * is <code>-n</code> 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 <code>ceil({@link org.apache.commons.pool2.ObjectPool#getNumIdle()
#getNumIdle()}/
+     * performed will be <code>ceil({@link #getNumIdle}/
      * abs({@link #getNumTestsPerEvictionRun})) whch means that when the value
      * is <code>-n</code> 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<K,T>
         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<ObjectDeque<T>> 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<T> 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();



Mime
View raw message