Return-Path: Delivered-To: apmail-commons-dev-archive@www.apache.org Received: (qmail 98929 invoked from network); 6 Feb 2010 03:28:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 Feb 2010 03:28:04 -0000 Received: (qmail 83998 invoked by uid 500); 6 Feb 2010 03:28:04 -0000 Delivered-To: apmail-commons-dev-archive@commons.apache.org Received: (qmail 83753 invoked by uid 500); 6 Feb 2010 03:28:03 -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 83743 invoked by uid 99); 6 Feb 2010 03:28:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Feb 2010 03:28:03 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of gudnabrsam@gmail.com designates 209.85.221.178 as permitted sender) Received: from [209.85.221.178] (HELO mail-qy0-f178.google.com) (209.85.221.178) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Feb 2010 03:27:53 +0000 Received: by qyk8 with SMTP id 8so8201qyk.24 for ; Fri, 05 Feb 2010 19:27:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:mime-version:in-reply-to :references:content-type:message-id:content-transfer-encoding:from :subject:date:to:x-mailer; bh=7yvkpIkqzanQ4p58biG/YPCGCvp6uJq16zEjrmXknTQ=; b=LgHuMBBB8hzIEfI1URw9UlnV4vlhSmceSCp2Yl1y++fm4h441cLbYRDqK7j83ijjNz jGtSCwQURznNQoy+G+MNyZHt7HWiIf+NBdDsPYQLR9Jdo27OwNnRkgX/QXjTKkpeG9e2 3QvTutUbxlqgCV6Tvy1z86gvw5NELBBXSLCYw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:content-type:message-id :content-transfer-encoding:from:subject:date:to:x-mailer; b=xfyhK4gHonrwK1nAVL4mOuB+6X7y3rVOngvbKiTtIHDy3mBDUjxIkIIhDfDh+h+Dra +Ur/x+5BIwROWgDsoLmpUEpMALUTh/rLLezLLQ/SG7706YWcQSNlYg6IKh0keMfP5n/E fNDgVx3QLfrTzLbKTGibHFjy50OWXl64zfbxA= Received: by 10.224.55.8 with SMTP id s8mr1413897qag.10.1265426852243; Fri, 05 Feb 2010 19:27:32 -0800 (PST) Received: from ?192.168.0.4? ([72.169.48.55]) by mx.google.com with ESMTPS id 20sm1422768qyk.13.2010.02.05.19.27.27 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 05 Feb 2010 19:27:31 -0800 (PST) Mime-Version: 1.0 (Apple Message framework v753.1) In-Reply-To: <25aac9fc1002051859q2ff32f10yefb0905ea10710dd@mail.gmail.com> References: <20100205231832.7733123889D7@eris.apache.org> <25aac9fc1002051859q2ff32f10yefb0905ea10710dd@mail.gmail.com> Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Message-Id: Content-Transfer-Encoding: 7bit From: Matt Benson Subject: Re: svn commit: r907129 - in /commons/proper/lang/branches/LANG_2_X/src: main/java/org/apache/commons/lang/builder/ToStringStyle.java test/java/org/apache/commons/lang/builder/ToStringBuilderTest.java Date: Fri, 5 Feb 2010 21:27:20 -0600 To: "Commons Developers List" X-Mailer: Apple Mail (2.753.1) X-Virus-Checked: Checked by ClamAV on apache.org Thanks Seb. :/ On Feb 5, 2010, at 8:59 PM, sebb wrote: > On 05/02/2010, mbenson@apache.org wrote: >> Author: mbenson >> Date: Fri Feb 5 23:18:32 2010 >> New Revision: 907129 >> >> URL: http://svn.apache.org/viewvc?rev=907129&view=rev >> Log: >> [LANG-586] merge >> >> Modified: >> commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/ >> commons/lang/builder/ToStringStyle.java >> commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/ >> commons/lang/builder/ToStringBuilderTest.java >> >> Modified: commons/proper/lang/branches/LANG_2_X/src/main/java/org/ >> apache/commons/lang/builder/ToStringStyle.java >> URL: http://svn.apache.org/viewvc/commons/proper/lang/branches/ >> LANG_2_X/src/main/java/org/apache/commons/lang/builder/ >> ToStringStyle.java?rev=907129&r1=907128&r2=907129&view=diff >> >> ===================================================================== >> ========= >> --- commons/proper/lang/branches/LANG_2_X/src/main/java/org/ >> apache/commons/lang/builder/ToStringStyle.java (original) >> +++ commons/proper/lang/branches/LANG_2_X/src/main/java/org/ >> apache/commons/lang/builder/ToStringStyle.java Fri Feb 5 23:18:32 >> 2010 > > ... > >> @@ -187,33 +186,41 @@ >> *

>> * Unregisters the given object. >> *

>> - * >> + * >> *

>> * Used by the reflection methods to avoid infinite loops. >> *

>> - * >> + * >> * @param value >> * The object to unregister. >> */ >> static void unregister(Object value) { >> - getRegistry().remove(value); >> + if (value != null) { >> + Map m = getRegistry(); >> + if (m != null) { >> + m.remove(value); >> + if (m.isEmpty()) { >> + REGISTRY.remove(); > > ThreadLocal.remove() requires Java 1.5+ > > --------------------------------------------------------------------- > 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