You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by Phil Steitz <ph...@gmail.com> on 2011/09/03 07:03:32 UTC
Re: svn commit: r1164625 - /commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
On 9/2/11 9:48 AM, markt@apache.org wrote:
> Author: markt
> Date: Fri Sep 2 16:48:59 2011
> New Revision: 1164625
>
> URL: http://svn.apache.org/viewvc?rev=1164625&view=rev
> Log:
> Fix typo
I guess you meant, remove trailing spaces or tabs or something?
Phil
>
> Modified:
> commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
>
> Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
> URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java?rev=1164625&r1=1164624&r2=1164625&view=diff
> ==============================================================================
> --- commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java (original)
> +++ commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java Fri Sep 2 16:48:59 2011
> @@ -1329,21 +1329,21 @@ public class GenericKeyedObjectPool<K,T>
> return p;
> }
>
> - private boolean destroy(K key, PooledObject<T> toDestory, boolean always)
> + private boolean destroy(K key, PooledObject<T> toDestroy, boolean always)
> throws Exception {
>
> register(key);
> - toDestory.invalidate();
> + toDestroy.invalidate();
>
> try {
> ObjectDeque<T> objectDeque = poolMap.get(key);
> - boolean isIdle = objectDeque.getIdleObjects().remove(toDestory);
> + boolean isIdle = objectDeque.getIdleObjects().remove(toDestroy);
>
> if (isIdle || always) {
> - objectDeque.getAllObjects().remove(toDestory.getObject());
> + objectDeque.getAllObjects().remove(toDestroy.getObject());
>
> try {
> - _factory.destroyObject(key, toDestory.getObject());
> + _factory.destroyObject(key, toDestroy.getObject());
> } finally {
> objectDeque.getCreateCount().decrementAndGet();
> destroyedCount.incrementAndGet();
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r1164625 - /commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
Posted by Phil Steitz <ph...@gmail.com>.
On 9/3/11 1:07 AM, markt@apache.org wrote:
> Phil Steitz <ph...@gmail.com> wrote:
>
>> On 9/2/11 9:48 AM, markt@apache.org wrote:
>>> Author: markt
>>> Date: Fri Sep 2 16:48:59 2011
>>> New Revision: 1164625
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1164625&view=rev
>>> Log:
>>> Fix typo
>> I guess you meant, remove trailing spaces or tabs or something?
>>
>> Phil
> Nope. What I typed is what I meant.
Sorry, blind last night :)
Phil
>
> Mark
>
>>> Modified:
>>>
>> commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
>>> Modified:
>> commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
>>> URL:
>> http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java?rev=1164625&r1=1164624&r2=1164625&view=diff
>> ==============================================================================
>>> ---
>> commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
>> (original)
>>> +++
>> commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
>> Fri Sep 2 16:48:59 2011
>>> @@ -1329,21 +1329,21 @@ public class GenericKeyedObjectPool<K,T>
>>> return p;
>>> }
>>>
>>> - private boolean destroy(K key, PooledObject<T> toDestory,
>> boolean always)
>>> + private boolean destroy(K key, PooledObject<T> toDestroy,
>> boolean always)
>>> throws Exception {
>>>
>>> register(key);
>>> - toDestory.invalidate();
>>> + toDestroy.invalidate();
>>>
>>> try {
>>> ObjectDeque<T> objectDeque = poolMap.get(key);
>>> - boolean isIdle =
>> objectDeque.getIdleObjects().remove(toDestory);
>>> + boolean isIdle =
>> objectDeque.getIdleObjects().remove(toDestroy);
>>>
>>> if (isIdle || always) {
>>> -
>> objectDeque.getAllObjects().remove(toDestory.getObject());
>>> +
>> objectDeque.getAllObjects().remove(toDestroy.getObject());
>>>
>>> try {
>>> - _factory.destroyObject(key,
>> toDestory.getObject());
>>> + _factory.destroyObject(key,
>> toDestroy.getObject());
>>> } finally {
>>> objectDeque.getCreateCount().decrementAndGet();
>>> destroyedCount.incrementAndGet();
>>>
>>>
>>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
>> For additional commands, e-mail: dev-help@commons.apache.org
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
> For additional commands, e-mail: dev-help@commons.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r1164625 - /commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
Posted by ma...@apache.org.
Phil Steitz <ph...@gmail.com> wrote:
>On 9/2/11 9:48 AM, markt@apache.org wrote:
>> Author: markt
>> Date: Fri Sep 2 16:48:59 2011
>> New Revision: 1164625
>>
>> URL: http://svn.apache.org/viewvc?rev=1164625&view=rev
>> Log:
>> Fix typo
>
>I guess you meant, remove trailing spaces or tabs or something?
>
>Phil
Nope. What I typed is what I meant.
Mark
>>
>> Modified:
>>
>commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
>>
>> Modified:
>commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
>> URL:
>http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java?rev=1164625&r1=1164624&r2=1164625&view=diff
>>
>==============================================================================
>> ---
>commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
>(original)
>> +++
>commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
>Fri Sep 2 16:48:59 2011
>> @@ -1329,21 +1329,21 @@ public class GenericKeyedObjectPool<K,T>
>> return p;
>> }
>>
>> - private boolean destroy(K key, PooledObject<T> toDestory,
>boolean always)
>> + private boolean destroy(K key, PooledObject<T> toDestroy,
>boolean always)
>> throws Exception {
>>
>> register(key);
>> - toDestory.invalidate();
>> + toDestroy.invalidate();
>>
>> try {
>> ObjectDeque<T> objectDeque = poolMap.get(key);
>> - boolean isIdle =
>objectDeque.getIdleObjects().remove(toDestory);
>> + boolean isIdle =
>objectDeque.getIdleObjects().remove(toDestroy);
>>
>> if (isIdle || always) {
>> -
>objectDeque.getAllObjects().remove(toDestory.getObject());
>> +
>objectDeque.getAllObjects().remove(toDestroy.getObject());
>>
>> try {
>> - _factory.destroyObject(key,
>toDestory.getObject());
>> + _factory.destroyObject(key,
>toDestroy.getObject());
>> } finally {
>> objectDeque.getCreateCount().decrementAndGet();
>> destroyedCount.incrementAndGet();
>>
>>
>>
>
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
>For additional commands, e-mail: dev-help@commons.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org