Author: sandymac Date: Thu Mar 30 21:56:54 2006 New Revision: 390338 URL: http://svn.apache.org/viewcvs?rev=390338&view=rev Log: Previously missed some configure method renames.
Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeKeyedObjectPoolFactory.java jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeObjectPoolFactory.java jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/TrackingPolicy.java Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeKeyedObjectPoolFactory.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeKeyedObjectPoolFactory.java?rev=390338&r1=390337&r2=390338&view=diff ============================================================================== --- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeKeyedObjectPoolFactory.java (original) +++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeKeyedObjectPoolFactory.java Thu Mar 30 21:56:54 2006 @@ -327,8 +327,8 @@ * * @return Type of tracking for active objects while they are borrowed from the pool. */ - public TrackingPolicy getTrackerType() { - return factory.getTrackerType(); + public TrackingPolicy getTrackingPolicy() { + return factory.getTrackingPolicy(); } /** @@ -337,8 +337,8 @@ * @param trackerPolicy type of tracking for active objects. * @throws IllegalArgumentException when <code>trackerPolicy</code> is <code>null</code>. */ - public void setTrackerType(final TrackingPolicy trackerPolicy) throws IllegalArgumentException { - factory.setTrackerType(trackerPolicy); + public void setTrackingPolicy(final TrackingPolicy trackerPolicy) throws IllegalArgumentException { + factory.setTrackingPolicy(trackerPolicy); } /** Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeObjectPoolFactory.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeObjectPoolFactory.java?rev=390338&r1=390337&r2=390338&view=diff ============================================================================== --- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeObjectPoolFactory.java (original) +++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeObjectPoolFactory.java Thu Mar 30 21:56:54 2006 @@ -43,7 +43,7 @@ * <li>[EMAIL PROTECTED] #setMaxWaitMillis(int) maxWaitMillis}: a non-positive value (wait forever) * (has no effect unless [EMAIL PROTECTED] #setLimitPolicy(LimitPolicy) limitPolicy} is * [EMAIL PROTECTED] LimitPolicy#WAIT WAIT})</li> - * <li>[EMAIL PROTECTED] #setTrackerType(TrackingPolicy) trackingPolicy}: + * <li>[EMAIL PROTECTED] #setTrackingPolicy(TrackingPolicy) trackingPolicy}: * [EMAIL PROTECTED] TrackingPolicy#SIMPLE SIMPLE}</li> * <li>[EMAIL PROTECTED] #setValidateOnReturn(boolean) validateOnReturn}: false (do not validate on return)</li> * <li>[EMAIL PROTECTED] #setEvictIdleMillis(long) evictIdleMillis}: non-positive (do not evict objects for being idle)</li> @@ -230,8 +230,9 @@ * Create and return a new <code>ObjectPool</code>. * * @return a new [EMAIL PROTECTED] ObjectPool} + * @throws IllegalStateException when this pool factory is not configured properly */ - public ObjectPool createPool() { + public ObjectPool createPool() throws IllegalStateException { return createPool(getConfig()); } @@ -240,8 +241,9 @@ * * @param config the settings to use to construct said pool. * @return a new [EMAIL PROTECTED] ObjectPool} + * @throws IllegalStateException when this pool factory is not configured properly */ - static ObjectPool createPool(final FactoryConfig config) { + static ObjectPool createPool(final FactoryConfig config) throws IllegalStateException { if (config == null) { throw new IllegalArgumentException("config must not be null."); } @@ -593,7 +595,7 @@ * * @return Type of tracking for active objects while they are borrowed from the pool. */ - public TrackingPolicy getTrackerType() { + public TrackingPolicy getTrackingPolicy() { return trackerPolicy; } @@ -603,7 +605,7 @@ * @param trackerPolicy type of tracking for active objects. * @throws IllegalArgumentException when <code>trackerPolicy</code> is <code>null</code>. */ - public void setTrackerType(final TrackingPolicy trackerPolicy) throws IllegalArgumentException { + public void setTrackingPolicy(final TrackingPolicy trackerPolicy) throws IllegalArgumentException { if (trackerPolicy == null) { throw new IllegalArgumentException("tracker type must not be null."); } @@ -755,7 +757,7 @@ */ FactoryConfig(final CompositeObjectPoolFactory copf) { this(copf.getFactory(), copf.getBorrowPolicy(), copf.getExhaustionPolicy(), copf.getMaxIdle(), - copf.getMaxActive(), copf.getLimitPolicy(), copf.getMaxWaitMillis(), copf.getTrackerType(), + copf.getMaxActive(), copf.getLimitPolicy(), copf.getMaxWaitMillis(), copf.getTrackingPolicy(), copf.isValidateOnReturn(), copf.getEvictIdleMillis(), copf.getEvictInvalidFrequencyMillis()); } Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/TrackingPolicy.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/TrackingPolicy.java?rev=390338&r1=390337&r2=390338&view=diff ============================================================================== --- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/TrackingPolicy.java (original) +++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/TrackingPolicy.java Thu Mar 30 21:56:54 2006 @@ -23,8 +23,8 @@ /** * Configures how active objects are tracked while they are borrowed from the pool. * - * @see CompositeObjectPoolFactory#setTrackerType(TrackingPolicy) - * @see CompositeKeyedObjectPoolFactory#setTrackerType(TrackingPolicy) + * @see CompositeObjectPoolFactory#setTrackingPolicy(TrackingPolicy) + * @see CompositeKeyedObjectPoolFactory#setTrackingPolicy(TrackingPolicy) * @author Sandy McArthur * @since #.# * @version $Revision$ $Date$ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]