Author: ggregory
Date: Fri Mar 4 06:38:45 2016
New Revision: 1733560
URL: http://svn.apache.org/viewvc?rev=1733560&view=rev
Log:
[POOL-309] Fix misspellings from "destory" to "destroy".
Modified:
commons/proper/pool/trunk/src/changes/changes.xml
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
Modified: commons/proper/pool/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/changes/changes.xml?rev=1733560&r1=1733559&r2=1733560&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/changes/changes.xml (original)
+++ commons/proper/pool/trunk/src/changes/changes.xml Fri Mar 4 06:38:45 2016
@@ -44,6 +44,9 @@ The <action> type attribute can be add,u
</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.">
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java?rev=1733560&r1=1733559&r2=1733560&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
Fri Mar 4 06:38:45 2016
@@ -880,17 +880,17 @@ public class GenericObjectPool<T> extend
/**
* 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();
Modified:
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java?rev=1733560&r1=1733559&r2=1733560&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
Fri Mar 4 06:38:45 2016
@@ -379,7 +379,7 @@ public abstract class TestKeyedObjectPoo
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);
