Return-Path: Delivered-To: apmail-commons-commits-archive@locus.apache.org Received: (qmail 15624 invoked from network); 3 Nov 2008 22:41:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Nov 2008 22:41:32 -0000 Received: (qmail 56571 invoked by uid 500); 3 Nov 2008 22:41:37 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 56513 invoked by uid 500); 3 Nov 2008 22:41:37 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 56504 invoked by uid 99); 3 Nov 2008 22:41:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Nov 2008 14:41:37 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Nov 2008 22:40:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 43288238889D; Mon, 3 Nov 2008 14:41:10 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r710200 - in /commons/proper/collections/trunk/src: java/org/apache/commons/collections/ExtendedProperties.java test/org/apache/commons/collections/TestExtendedProperties.java Date: Mon, 03 Nov 2008 22:41:10 -0000 To: commits@commons.apache.org From: bayard@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081103224110.43288238889D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bayard Date: Mon Nov 3 14:41:09 2008 New Revision: 710200 URL: http://svn.apache.org/viewvc?rev=710200&view=rev Log: Applying Nathan Bubna's patch from COLLECTIONS-271 to fix the bug introduced in the last patch where getKeys() breaks after a combine() or subset() call. Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/ExtendedProperties.java commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestExtendedProperties.java Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/ExtendedProperties.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/ExtendedProperties.java?rev=710200&r1=710199&r2=710200&view=diff ============================================================================== --- commons/proper/collections/trunk/src/java/org/apache/commons/collections/ExtendedProperties.java (original) +++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/ExtendedProperties.java Mon Nov 3 14:41:09 2008 @@ -820,7 +820,8 @@ public void combine(ExtendedProperties props) { for (Iterator it = props.getKeys(); it.hasNext();) { String key = (String) it.next(); - super.put(key, props.get(key)); + clearProperty(key); + addPropertyDirect(key, props.get(key)); } } Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestExtendedProperties.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestExtendedProperties.java?rev=710200&r1=710199&r2=710200&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestExtendedProperties.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestExtendedProperties.java Mon Nov 3 14:41:09 2008 @@ -405,6 +405,15 @@ ExtendedProperties props2 = new ExtendedProperties(); props2.combine(props); assertEquals( "\\\\192.168.1.91\\test", props2.getProperty("test") ); + + ExtendedProperties props3 = new ExtendedProperties(); + props3.setProperty("sub.test", "foo"); + props2.combine(props3); + assertEquals("foo", props2.getProperty("sub.test")); + + ExtendedProperties subs = props2.subset("sub"); + assertNotNull(subs); + assertEquals("foo", subs.getProperty("test")); } public void testCollections238() throws IOException {