Return-Path: X-Original-To: apmail-commons-dev-archive@www.apache.org Delivered-To: apmail-commons-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B557E8FA5 for ; Sat, 3 Sep 2011 15:21:21 +0000 (UTC) Received: (qmail 12608 invoked by uid 500); 3 Sep 2011 15:21:20 -0000 Delivered-To: apmail-commons-dev-archive@commons.apache.org Received: (qmail 12511 invoked by uid 500); 3 Sep 2011 15:21:19 -0000 Mailing-List: contact dev-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Commons Developers List" Delivered-To: mailing list dev@commons.apache.org Received: (qmail 12502 invoked by uid 99); 3 Sep 2011 15:21:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Sep 2011 15:21:18 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of phil.steitz@gmail.com designates 209.85.213.171 as permitted sender) Received: from [209.85.213.171] (HELO mail-yx0-f171.google.com) (209.85.213.171) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Sep 2011 15:21:09 +0000 Received: by yxs7 with SMTP id 7so2631428yxs.30 for ; Sat, 03 Sep 2011 08:20:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type:content-transfer-encoding; bh=n3QdRP2+gELlt+gX9o40GceeUp+FDIfKIoaJmFTwX88=; b=A17npbHSMismyx0JEse1LVAWzg+qACTsRWGm+l2j6mKDYjPjnOUyIyky/Z0b0YCNqJ QM0HL4dfE2s1e1zAi1sNkb81H83qXOSqyJ3z6k5K/Or7D2DrVLcYTB6qFlJswMZqw90n abOwnCcx7ZZt5qdTaTxFoyxQvt8TGrnhzHQg4= Received: by 10.68.43.193 with SMTP id y1mr8485pbl.502.1315063248291; Sat, 03 Sep 2011 08:20:48 -0700 (PDT) Received: from [192.168.0.2] (75-171-18-48.phnx.qwest.net. [75.171.18.48]) by mx.google.com with ESMTPS id p7sm6804634pbe.0.2011.09.03.08.20.45 (version=SSLv3 cipher=OTHER); Sat, 03 Sep 2011 08:20:46 -0700 (PDT) Message-ID: <4E6245CC.3090902@gmail.com> Date: Sat, 03 Sep 2011 08:20:44 -0700 From: Phil Steitz User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:6.0.1) Gecko/20110830 Thunderbird/6.0.1 MIME-Version: 1.0 To: Commons Developers List Subject: Re: svn commit: r1164625 - /commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java References: <20110902164859.EA9D12388A02@eris.apache.org> <4E61B524.7080104@gmail.com> In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org On 9/3/11 1:07 AM, markt@apache.org wrote: > Phil Steitz 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 >>> return p; >>> } >>> >>> - private boolean destroy(K key, PooledObject toDestory, >> boolean always) >>> + private boolean destroy(K key, PooledObject toDestroy, >> boolean always) >>> throws Exception { >>> >>> register(key); >>> - toDestory.invalidate(); >>> + toDestroy.invalidate(); >>> >>> try { >>> ObjectDeque 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