Author: markt
Date: Thu Mar 17 14:35:06 2016
New Revision: 1735436
URL: http://svn.apache.org/viewvc?rev=1735436&view=rev
Log:
Fix DBCP-456
Correct the name of the configuration attribute softMinEvictableIdleTimeMillis.
Modified:
commons/proper/dbcp/trunk/src/changes/changes.xml
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
commons/proper/dbcp/trunk/src/site/xdoc/configuration.xml
Modified: commons/proper/dbcp/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/changes/changes.xml?rev=1735436&r1=1735435&r2=1735436&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/changes/changes.xml (original)
+++ commons/proper/dbcp/trunk/src/changes/changes.xml Thu Mar 17 14:35:06 2016
@@ -85,6 +85,10 @@ The <action> type attribute can be add,u
Ensure that setSoftMinEvictableIdleTimeMillis is used when working with
BasicDataSource.
</action>
+ <action dev="markt" type="fix" issue="DBCP-456" due-to="Kyohei Nakamura">
+ Correct the name of the configuration attribute
+ softMinEvictableIdleTimeMillis.
+ </action>
</release>
<release version="2.1.1" date="6 Aug 2015" description=
"This is a patch release, including bug fixes only.">
Modified:
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java?rev=1735436&r1=1735435&r2=1735436&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
(original)
+++
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
Thu Mar 17 14:35:06 2016
@@ -895,8 +895,8 @@ public class BasicDataSource implements
* the extra condition that at least "minIdle" connections remain in the
* pool.</p>
*
- * <p>When {@link #getMinEvictableIdleTimeMillis()
miniEvictableIdleTimeMillis}
- * is set to a positive value, miniEvictableIdleTimeMillis is examined
+ * <p>When {@link #getMinEvictableIdleTimeMillis()
minEvictableIdleTimeMillis}
+ * is set to a positive value, minEvictableIdleTimeMillis is examined
* first by the idle connection evictor - i.e. when idle connections are
* visited by the evictor, idle time is first compared against
* {@code minEvictableIdleTimeMillis} (without considering the number of
idle
Modified: commons/proper/dbcp/trunk/src/site/xdoc/configuration.xml
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/site/xdoc/configuration.xml?rev=1735436&r1=1735435&r2=1735436&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/site/xdoc/configuration.xml (original)
+++ commons/proper/dbcp/trunk/src/site/xdoc/configuration.xml Thu Mar 17
14:35:06 2016
@@ -287,16 +287,16 @@ isValid() method.
</td>
</tr>
<tr>
- <td>softMiniEvictableIdleTimeMillis</td>
+ <td>softMinEvictableIdleTimeMillis</td>
<td>-1</td>
<td>
The minimum amount of time a connection may sit idle in the pool before
it is eligible for eviction by the idle connection evictor, with
the extra condition that at least "minIdle" connections remain in the
- pool. When miniEvictableIdleTimeMillis is set to a positive value,
- miniEvictableIdleTimeMillis is examined first by the idle
+ pool. When minEvictableIdleTimeMillis is set to a positive value,
+ minEvictableIdleTimeMillis is examined first by the idle
connection evictor - i.e. when idle connections are visited by the
- evictor, idle time is first compared against miniEvictableIdleTimeMillis
+ evictor, idle time is first compared against minEvictableIdleTimeMillis
(without considering the number of idle connections in the pool) and then
against softMinEvictableIdleTimeMillis, including the minIdle constraint.
</td>
