You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2017/03/12 19:47:50 UTC
[20/50] [abbrv] commons-pool git commit: [POOL-309] Fix misspellings
from "destory" to "destroy".
[POOL-309] Fix misspellings from "destory" to "destroy".
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/pool/trunk@1733560 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-pool/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-pool/commit/5ec116ad
Tree: http://git-wip-us.apache.org/repos/asf/commons-pool/tree/5ec116ad
Diff: http://git-wip-us.apache.org/repos/asf/commons-pool/diff/5ec116ad
Branch: refs/heads/master
Commit: 5ec116ad0b261b3143c24ff9a37c27bfc8182040
Parents: 14d8291
Author: Gary D. Gregory <gg...@apache.org>
Authored: Fri Mar 4 06:38:45 2016 +0000
Committer: Gary D. Gregory <gg...@apache.org>
Committed: Fri Mar 4 06:38:45 2016 +0000
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
.../apache/commons/pool2/impl/GenericObjectPool.java | 12 ++++++------
.../org/apache/commons/pool2/TestKeyedObjectPool.java | 2 +-
3 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-pool/blob/5ec116ad/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2260289..2503b03 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -44,6 +44,9 @@ The <action> type attribute can be add,update,fix,remove.
</properties>
<body>
<release version="2.4.3" date="TBD" description="TBD">
+ <action dev="ggregory" issue="POOL-309" type="fix">
+ Fix misspellings from "destory" to "destroy".
+ </action>
</release>
<release version="2.4.2" date="2015-08-01" description=
"This is a patch release, including bug fixes only.">
http://git-wip-us.apache.org/repos/asf/commons-pool/blob/5ec116ad/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
----------------------------------------------------------------------
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 2e7f047..6c8dc71 100644
--- a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
@@ -880,17 +880,17 @@ public class GenericObjectPool<T> extends BaseGenericObjectPool<T>
/**
* Destroys a wrapped pooled object.
*
- * @param toDestory The wrapped pooled object to destroy
+ * @param toDestroy The wrapped pooled object to destroy
*
* @throws Exception If the factory fails to destroy the pooled object
* cleanly
*/
- private void destroy(final PooledObject<T> toDestory) throws Exception {
- toDestory.invalidate();
- idleObjects.remove(toDestory);
- allObjects.remove(new IdentityWrapper<T>(toDestory.getObject()));
+ private void destroy(final PooledObject<T> toDestroy) throws Exception {
+ toDestroy.invalidate();
+ idleObjects.remove(toDestroy);
+ allObjects.remove(new IdentityWrapper<T>(toDestroy.getObject()));
try {
- factory.destroyObject(toDestory);
+ factory.destroyObject(toDestroy);
} finally {
destroyedCount.incrementAndGet();
createCount.decrementAndGet();
http://git-wip-us.apache.org/repos/asf/commons-pool/blob/5ec116ad/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java b/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
index 4c646cc..75653f2 100644
--- a/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
@@ -379,7 +379,7 @@ public abstract class TestKeyedObjectPool {
PoolUtils.prefill(pool, KEY, 5);
pool.clear();
- //// Test exception handling clear should swallow destory object failures
+ //// Test exception handling clear should swallow destroy object failures
reset(pool, factory, expectedMethods);
factory.setDestroyObjectFail(true);
PoolUtils.prefill(pool, KEY, 5);