commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pste...@apache.org
Subject svn commit: r1544740 - /commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
Date Sat, 23 Nov 2013 04:19:47 GMT
Author: psteitz
Date: Sat Nov 23 04:19:45 2013
New Revision: 1544740

URL: http://svn.apache.org/r1544740
Log:
Javadoc only. Fixed typo; clarified create contract.

Modified:
    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/GenericObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java?rev=1544740&r1=1544739&r2=1544740&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
Sat Nov 23 04:19:45 2013
@@ -799,11 +799,14 @@ public class GenericObjectPool<T> extend
     }
 
     /**
-     * Creates a new wrapped pooled object.
+     * Attempts to create a new wrapped pooled object.
+     * <p>
+     * If there are {@link #getMaxTotal()} objects already in circulation
+     * or in process of being created, this method returns null.
      *
      * @return The new wrapped pooled object
      *
-     * @throws Exception if the creation of the pooled object fails
+     * @throws Exception if the object factory's {@code makeObject} fails
      */
     private PooledObject<T> create() throws Exception {
         int localMaxTotal = getMaxTotal();
@@ -1062,7 +1065,7 @@ public class GenericObjectPool<T> extend
      * The combined count of the currently created objects and those in the
      * process of being created. Under load, it may exceed {@link #_maxActive}
      * if multiple threads try and create a new object at the same time but
-     * {@link #create(boolean)} will ensure that there are never more than
+     * {@link #create()} will ensure that there are never more than
      * {@link #_maxActive} objects created at any one time.
      */
     private final AtomicLong createCount = new AtomicLong(0);



Mime
View raw message