You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2021/08/12 17:02:13 UTC
[commons-pool] branch master updated: Fix toString message and
exception message.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-pool.git
The following commit(s) were added to refs/heads/master by this push:
new c41cf53 Fix toString message and exception message.
c41cf53 is described below
commit c41cf53b28eaf7eb0b13648a18e25673851623c1
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Aug 12 13:02:11 2021 -0400
Fix toString message and exception message.
- Fix field label in BaseGenericObjectPool: From
timeBetweenEvictionRunsMillis to durationBetweenEvictionRuns.
- Fix field label in BaseObjectPoolConfig: From maxWaitMillis to
maxWaitDuration.
- Fix field label in NoSuchElementException message for
GenericObjectPool.borrowObject(Duration): From borrowMaxWaitMillis to
borrowMaxWaitDuration.
- Javadoc tweak.
---
src/changes/changes.xml | 12 +
.../commons/pool2/impl/BaseGenericObjectPool.java | 4 +-
.../commons/pool2/impl/BaseObjectPoolConfig.java | 2 +-
.../commons/pool2/impl/GenericObjectPool.java | 2 +-
src/site/xdoc/download_pool.xml | 262 ++++++++++-----------
5 files changed, 147 insertions(+), 135 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 7bfda89..146eb5d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -43,6 +43,18 @@ The <action> type attribute can be add,update,fix,remove.
<title>Apache Commons Pool Release Notes</title>
</properties>
<body>
+ <release version="2.11.1" date="2021-08-08" description="This is a maintenance release (Java 8).">
+ <!-- FIXES -->
+ <action dev="ggregory" type="fix" due-to="Gary Gregory">
+ Fix field label in BaseGenericObjectPool: From timeBetweenEvictionRunsMillis to durationBetweenEvictionRuns.
+ </action>
+ <action dev="ggregory" type="fix" due-to="Gary Gregory">
+ Fix field label in BaseObjectPoolConfig: From maxWaitMillis to maxWaitDuration.
+ </action>
+ <action dev="ggregory" type="fix" due-to="Gary Gregory">
+ Fix field label in NoSuchElementException message for GenericObjectPool.borrowObject(Duration): From borrowMaxWaitMillis to borrowMaxWaitDuration.
+ </action>
+ </release>
<release version="2.11.0" date="2021-08-08" description="This is a feature release (Java 8).">
<!-- FIXES -->
<action dev="ggregory" type="fix" due-to="Gary Gregory">
diff --git a/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java b/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
index e4cd892..950c733 100644
--- a/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
@@ -1026,7 +1026,7 @@ public abstract class BaseGenericObjectPool<T> extends BaseObject {
}
/**
- * The listener used (if any) to receive notifications of exceptions
+ * Gets the listener used (if any) to receive notifications of exceptions
* unavoidably swallowed by the pool.
*
* @return The listener or {@code null} for no listener
@@ -1842,7 +1842,7 @@ public abstract class BaseGenericObjectPool<T> extends BaseObject {
builder.append(testOnReturn);
builder.append(", testWhileIdle=");
builder.append(testWhileIdle);
- builder.append(", timeBetweenEvictionRunsMillis=");
+ builder.append(", durationBetweenEvictionRuns=");
builder.append(durationBetweenEvictionRuns);
builder.append(", numTestsPerEvictionRun=");
builder.append(numTestsPerEvictionRun);
diff --git a/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java b/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
index 173aafb..d06f380 100644
--- a/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
+++ b/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
@@ -1054,7 +1054,7 @@ public abstract class BaseObjectPoolConfig<T> extends BaseObject implements Clon
builder.append(lifo);
builder.append(", fairness=");
builder.append(fairness);
- builder.append(", maxWaitMillis=");
+ builder.append(", maxWaitDuration=");
builder.append(maxWaitDuration);
builder.append(", minEvictableIdleTime=");
builder.append(minEvictableIdleDuration);
diff --git a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
index e778101..e7bf0a2 100644
--- a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
@@ -310,7 +310,7 @@ public class GenericObjectPool<T> extends BaseGenericObjectPool<T>
}
if (p == null) {
throw new NoSuchElementException(appendStats(
- "Timeout waiting for idle object, borrowMaxWaitMillis=" + borrowMaxWaitDuration));
+ "Timeout waiting for idle object, borrowMaxWaitDuration=" + borrowMaxWaitDuration));
}
} else if (p == null) {
throw new NoSuchElementException(appendStats("Pool exhausted"));
diff --git a/src/site/xdoc/download_pool.xml b/src/site/xdoc/download_pool.xml
index 7efbaf3..7a0f66a 100644
--- a/src/site/xdoc/download_pool.xml
+++ b/src/site/xdoc/download_pool.xml
@@ -113,134 +113,134 @@ limitations under the License.
</p>
</subsection>
</section>
- <section name="Apache Commons Pool 2.11.0 (Java 8)">
- <subsection name="Binaries">
- <table>
- <tr>
- <td><a href="[preferred]/commons/pool/binaries/commons-pool2-2.11.0-bin.tar.gz">commons-pool2-2.11.0-bin.tar.gz</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.11.0-bin.tar.gz.sha512">sha512</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.11.0-bin.tar.gz.asc">pgp</a></td>
- </tr>
- <tr>
- <td><a href="[preferred]/commons/pool/binaries/commons-pool2-2.11.0-bin.zip">commons-pool2-2.11.0-bin.zip</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.11.0-bin.zip.sha512">sha512</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.11.0-bin.zip.asc">pgp</a></td>
- </tr>
- </table>
- </subsection>
- <subsection name="Source">
- <table>
- <tr>
- <td><a href="[preferred]/commons/pool/source/commons-pool2-2.11.0-src.tar.gz">commons-pool2-2.11.0-src.tar.gz</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.11.0-src.tar.gz.sha512">sha512</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.11.0-src.tar.gz.asc">pgp</a></td>
- </tr>
- <tr>
- <td><a href="[preferred]/commons/pool/source/commons-pool2-2.11.0-src.zip">commons-pool2-2.11.0-src.zip</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.11.0-src.zip.sha512">sha512</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.11.0-src.zip.asc">pgp</a></td>
- </tr>
- </table>
- </subsection>
- </section>
- <section name="Apache Commons Pool 2.6.2 (Java 7)">
- <subsection name="Binaries">
- <table>
- <tr>
- <td><a href="[preferred]/commons/pool/binaries/commons-pool2-2.6.2-bin.tar.gz">commons-pool2-2.6.2-bin.tar.gz</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.6.2-bin.tar.gz.sha512">sha512</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.6.2-bin.tar.gz.asc">pgp</a></td>
- </tr>
- <tr>
- <td><a href="[preferred]/commons/pool/binaries/commons-pool2-2.6.2-bin.zip">commons-pool2-2.6.2-bin.zip</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.6.2-bin.zip.sha512">sha512</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.6.2-bin.zip.asc">pgp</a></td>
- </tr>
- </table>
- </subsection>
- <subsection name="Source">
- <table>
- <tr>
- <td><a href="[preferred]/commons/pool/source/commons-pool2-2.6.2-src.tar.gz">commons-pool2-2.6.2-src.tar.gz</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.6.2-src.tar.gz.sha512">sha512</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.6.2-src.tar.gz.asc">pgp</a></td>
- </tr>
- <tr>
- <td><a href="[preferred]/commons/pool/source/commons-pool2-2.6.2-src.zip">commons-pool2-2.6.2-src.zip</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.6.2-src.zip.sha512">sha512</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.6.2-src.zip.asc">pgp</a></td>
- </tr>
- </table>
- </subsection>
- </section>
- <section name="Apache Commons Pool 2.4.3 (Java 6)">
- <subsection name="Binaries">
- <table>
- <tr>
- <td><a href="[preferred]/commons/pool/binaries/commons-pool2-2.4.3-bin.tar.gz">commons-pool2-2.4.3-bin.tar.gz</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.4.3-bin.tar.gz.sha256">sha256</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.4.3-bin.tar.gz.asc">pgp</a></td>
- </tr>
- <tr>
- <td><a href="[preferred]/commons/pool/binaries/commons-pool2-2.4.3-bin.zip">commons-pool2-2.4.3-bin.zip</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.4.3-bin.zip.sha256">sha256</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.4.3-bin.zip.asc">pgp</a></td>
- </tr>
- </table>
- </subsection>
- <subsection name="Source">
- <table>
- <tr>
- <td><a href="[preferred]/commons/pool/source/commons-pool2-2.4.3-src.tar.gz">commons-pool2-2.4.3-src.tar.gz</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.4.3-src.tar.gz.sha256">sha256</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.4.3-src.tar.gz.asc">pgp</a></td>
- </tr>
- <tr>
- <td><a href="[preferred]/commons/pool/source/commons-pool2-2.4.3-src.zip">commons-pool2-2.4.3-src.zip</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.4.3-src.zip.sha256">sha256</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.4.3-src.zip.asc">pgp</a></td>
- </tr>
- </table>
- </subsection>
- </section>
- <section name="Apache Commons Pool 1.6 (Java 5)">
- <subsection name="Binaries">
- <table>
- <tr>
- <td><a href="[preferred]/commons/pool/binaries/commons-pool-1.6-bin.tar.gz">commons-pool-1.6-bin.tar.gz</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool-1.6-bin.tar.gz.sha256">sha256</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool-1.6-bin.tar.gz.asc">pgp</a></td>
- </tr>
- <tr>
- <td><a href="[preferred]/commons/pool/binaries/commons-pool-1.6-bin.zip">commons-pool-1.6-bin.zip</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool-1.6-bin.zip.sha256">sha256</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool-1.6-bin.zip.asc">pgp</a></td>
- </tr>
- </table>
- </subsection>
- <subsection name="Source">
- <table>
- <tr>
- <td><a href="[preferred]/commons/pool/source/commons-pool-1.6-src.tar.gz">commons-pool-1.6-src.tar.gz</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool-1.6-src.tar.gz.sha256">sha256</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool-1.6-src.tar.gz.asc">pgp</a></td>
- </tr>
- <tr>
- <td><a href="[preferred]/commons/pool/source/commons-pool-1.6-src.zip">commons-pool-1.6-src.zip</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool-1.6-src.zip.sha256">sha256</a></td>
- <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool-1.6-src.zip.asc">pgp</a></td>
- </tr>
- </table>
- </subsection>
- </section>
- <section name="Archives">
- <p>
- Older releases can be obtained from the archives.
- </p>
- <ul>
- <li class="download"><a href="[preferred]/commons/pool/">browse download area</a></li>
- <li><a href="https://archive.apache.org/dist/commons/pool/">archives...</a></li>
- </ul>
- </section>
- </body>
-</document>
+ <section name="Apache Commons Pool 2.11.0 (Java 8)">
+ <subsection name="Binaries">
+ <table>
+ <tr>
+ <td><a href="[preferred]/commons/pool/binaries/commons-pool2-2.11.0-bin.tar.gz">commons-pool2-2.11.0-bin.tar.gz</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.11.0-bin.tar.gz.sha512">sha512</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.11.0-bin.tar.gz.asc">pgp</a></td>
+ </tr>
+ <tr>
+ <td><a href="[preferred]/commons/pool/binaries/commons-pool2-2.11.0-bin.zip">commons-pool2-2.11.0-bin.zip</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.11.0-bin.zip.sha512">sha512</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.11.0-bin.zip.asc">pgp</a></td>
+ </tr>
+ </table>
+ </subsection>
+ <subsection name="Source">
+ <table>
+ <tr>
+ <td><a href="[preferred]/commons/pool/source/commons-pool2-2.11.0-src.tar.gz">commons-pool2-2.11.0-src.tar.gz</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.11.0-src.tar.gz.sha512">sha512</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.11.0-src.tar.gz.asc">pgp</a></td>
+ </tr>
+ <tr>
+ <td><a href="[preferred]/commons/pool/source/commons-pool2-2.11.0-src.zip">commons-pool2-2.11.0-src.zip</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.11.0-src.zip.sha512">sha512</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.11.0-src.zip.asc">pgp</a></td>
+ </tr>
+ </table>
+ </subsection>
+ </section>
+ <section name="Apache Commons Pool 2.6.2 (Java 7)">
+ <subsection name="Binaries">
+ <table>
+ <tr>
+ <td><a href="[preferred]/commons/pool/binaries/commons-pool2-2.6.2-bin.tar.gz">commons-pool2-2.6.2-bin.tar.gz</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.6.2-bin.tar.gz.sha512">sha512</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.6.2-bin.tar.gz.asc">pgp</a></td>
+ </tr>
+ <tr>
+ <td><a href="[preferred]/commons/pool/binaries/commons-pool2-2.6.2-bin.zip">commons-pool2-2.6.2-bin.zip</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.6.2-bin.zip.sha512">sha512</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.6.2-bin.zip.asc">pgp</a></td>
+ </tr>
+ </table>
+ </subsection>
+ <subsection name="Source">
+ <table>
+ <tr>
+ <td><a href="[preferred]/commons/pool/source/commons-pool2-2.6.2-src.tar.gz">commons-pool2-2.6.2-src.tar.gz</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.6.2-src.tar.gz.sha512">sha512</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.6.2-src.tar.gz.asc">pgp</a></td>
+ </tr>
+ <tr>
+ <td><a href="[preferred]/commons/pool/source/commons-pool2-2.6.2-src.zip">commons-pool2-2.6.2-src.zip</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.6.2-src.zip.sha512">sha512</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.6.2-src.zip.asc">pgp</a></td>
+ </tr>
+ </table>
+ </subsection>
+ </section>
+ <section name="Apache Commons Pool 2.4.3 (Java 6)">
+ <subsection name="Binaries">
+ <table>
+ <tr>
+ <td><a href="[preferred]/commons/pool/binaries/commons-pool2-2.4.3-bin.tar.gz">commons-pool2-2.4.3-bin.tar.gz</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.4.3-bin.tar.gz.sha256">sha256</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.4.3-bin.tar.gz.asc">pgp</a></td>
+ </tr>
+ <tr>
+ <td><a href="[preferred]/commons/pool/binaries/commons-pool2-2.4.3-bin.zip">commons-pool2-2.4.3-bin.zip</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.4.3-bin.zip.sha256">sha256</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool2-2.4.3-bin.zip.asc">pgp</a></td>
+ </tr>
+ </table>
+ </subsection>
+ <subsection name="Source">
+ <table>
+ <tr>
+ <td><a href="[preferred]/commons/pool/source/commons-pool2-2.4.3-src.tar.gz">commons-pool2-2.4.3-src.tar.gz</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.4.3-src.tar.gz.sha256">sha256</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.4.3-src.tar.gz.asc">pgp</a></td>
+ </tr>
+ <tr>
+ <td><a href="[preferred]/commons/pool/source/commons-pool2-2.4.3-src.zip">commons-pool2-2.4.3-src.zip</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.4.3-src.zip.sha256">sha256</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool2-2.4.3-src.zip.asc">pgp</a></td>
+ </tr>
+ </table>
+ </subsection>
+ </section>
+ <section name="Apache Commons Pool 1.6 (Java 5)">
+ <subsection name="Binaries">
+ <table>
+ <tr>
+ <td><a href="[preferred]/commons/pool/binaries/commons-pool-1.6-bin.tar.gz">commons-pool-1.6-bin.tar.gz</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool-1.6-bin.tar.gz.sha256">sha256</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool-1.6-bin.tar.gz.asc">pgp</a></td>
+ </tr>
+ <tr>
+ <td><a href="[preferred]/commons/pool/binaries/commons-pool-1.6-bin.zip">commons-pool-1.6-bin.zip</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool-1.6-bin.zip.sha256">sha256</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/binaries/commons-pool-1.6-bin.zip.asc">pgp</a></td>
+ </tr>
+ </table>
+ </subsection>
+ <subsection name="Source">
+ <table>
+ <tr>
+ <td><a href="[preferred]/commons/pool/source/commons-pool-1.6-src.tar.gz">commons-pool-1.6-src.tar.gz</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool-1.6-src.tar.gz.sha256">sha256</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool-1.6-src.tar.gz.asc">pgp</a></td>
+ </tr>
+ <tr>
+ <td><a href="[preferred]/commons/pool/source/commons-pool-1.6-src.zip">commons-pool-1.6-src.zip</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool-1.6-src.zip.sha256">sha256</a></td>
+ <td><a href="https://www.apache.org/dist/commons/pool/source/commons-pool-1.6-src.zip.asc">pgp</a></td>
+ </tr>
+ </table>
+ </subsection>
+ </section>
+ <section name="Archives">
+ <p>
+ Older releases can be obtained from the archives.
+ </p>
+ <ul>
+ <li class="download"><a href="[preferred]/commons/pool/">browse download area</a></li>
+ <li><a href="https://archive.apache.org/dist/commons/pool/">archives...</a></li>
+ </ul>
+ </section>
+ </body>
+</document>