@@ -93,24 +93,20 @@ public class GenericObjectPool<T> extends BaseGenericObjectPool<T>
9393 private final PooledObjectFactory <T > factory ;
9494
9595 /*
96- * TODO The references to _maxActive are from 1.x and need to be updated.
97- *
9896 * All of the objects currently associated with this pool in any state. It
9997 * excludes objects that have been destroyed. The size of
10098 * {@link #allObjects} will always be less than or equal to {@link
101- * #_maxActive }. Map keys are pooled objects, values are the PooledObject
99+ * #getMaxTotal() }. Map keys are pooled objects, values are the PooledObject
102100 * wrappers used internally by the pool.
103101 */
104102 private final ConcurrentHashMap <IdentityWrapper <T >, PooledObject <T >> allObjects = new ConcurrentHashMap <>();
105103
106104 /*
107- * TODO The references to _maxActive are from 1.x and need to be updated.
108- *
109105 * The combined count of the currently created objects and those in the
110- * process of being created. Under load, it may exceed {@link #_maxActive }
106+ * process of being created. Under load, it may exceed {@link #getMaxTotal() }
111107 * if multiple threads try and create a new object at the same time but
112108 * {@link #create()} will ensure that there are never more than
113- * {@link #_maxActive } objects created at any one time.
109+ * {@link #getMaxTotal() } objects created at any one time.
114110 */
115111 private final AtomicLong createCount = new AtomicLong ();
116112
@@ -761,8 +757,6 @@ public void evict() throws Exception {
761757 }
762758 }
763759 underTest .endEvictionTest (idleObjects );
764- // TODO - May need to add code here once additional
765- // states are used
766760 }
767761 }
768762 }
0 commit comments