Browse Source

Merge pull request #856 from kazuki43zoo/SPR-13350

* pr/856:
  Fix default value of CommonsPool2TargetSource#maxWait
pull/857/head
Stephane Nicoll 11 years ago
parent
commit
bad57f752a
  1. 5
      spring-aop/src/main/java/org/springframework/aop/target/CommonsPool2TargetSource.java

5
spring-aop/src/main/java/org/springframework/aop/target/CommonsPool2TargetSource.java

@ -49,6 +49,7 @@ import org.apache.commons.pool2.impl.GenericObjectPoolConfig; @@ -49,6 +49,7 @@ import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
* @author Rob Harrop
* @author Juergen Hoeller
* @author Stephane Nicoll
* @author Kazuki Shimizu
* @since 4.2
* @see GenericObjectPool
* @see #createObjectPool()
@ -66,7 +67,7 @@ public class CommonsPool2TargetSource extends AbstractPoolingTargetSource implem @@ -66,7 +67,7 @@ public class CommonsPool2TargetSource extends AbstractPoolingTargetSource implem
private int minIdle = GenericObjectPoolConfig.DEFAULT_MIN_IDLE;
private long maxWait = GenericObjectPoolConfig.DEFAULT_MAX_TOTAL;
private long maxWait = GenericObjectPoolConfig.DEFAULT_MAX_WAIT_MILLIS;
private long timeBetweenEvictionRunsMillis = GenericObjectPoolConfig.DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS;
@ -126,7 +127,7 @@ public class CommonsPool2TargetSource extends AbstractPoolingTargetSource implem @@ -126,7 +127,7 @@ public class CommonsPool2TargetSource extends AbstractPoolingTargetSource implem
/**
* Set the maximum waiting time for fetching an object from the pool.
* Default is -1, waiting forever.
* @see GenericObjectPool#setMaxTotal
* @see GenericObjectPool#setMaxWaitMillis
*/
public void setMaxWait(long maxWait) {
this.maxWait = maxWait;

Loading…
Cancel
Save