Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 65342 invoked from network); 16 Apr 2009 09:12:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 16 Apr 2009 09:12:17 -0000 Received: (qmail 99818 invoked by uid 500); 16 Apr 2009 09:12:16 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 99765 invoked by uid 500); 16 Apr 2009 09:12:16 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 99756 invoked by uid 99); 16 Apr 2009 09:12:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Apr 2009 09:12:16 +0000 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; Thu, 16 Apr 2009 09:12:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E24722388B89; Thu, 16 Apr 2009 09:11:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r765529 - in /harmony/enhanced/classlib/trunk/modules/prefs/src: main/java/java/util/prefs/AbstractPreferences.java test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java Date: Thu, 16 Apr 2009 09:11:55 -0000 To: commits@harmony.apache.org From: regisxu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090416091155.E24722388B89@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: regisxu Date: Thu Apr 16 09:11:55 2009 New Revision: 765529 URL: http://svn.apache.org/viewvc?rev=765529&view=rev Log: Apply patch for HARMONY-6108: [classlib] [prefs] Preferences.nodeExists(null) should throw NPE when Preferences node has been removed Modified: harmony/enhanced/classlib/trunk/modules/prefs/src/main/java/java/util/prefs/AbstractPreferences.java harmony/enhanced/classlib/trunk/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java Modified: harmony/enhanced/classlib/trunk/modules/prefs/src/main/java/java/util/prefs/AbstractPreferences.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/src/main/java/java/util/prefs/AbstractPreferences.java?rev=765529&r1=765528&r2=765529&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/prefs/src/main/java/java/util/prefs/AbstractPreferences.java (original) +++ harmony/enhanced/classlib/trunk/modules/prefs/src/main/java/java/util/prefs/AbstractPreferences.java Thu Apr 16 09:11:55 2009 @@ -609,6 +609,9 @@ @Override public boolean nodeExists(String name) throws BackingStoreException { + if (null == name) { + throw new NullPointerException(); + } AbstractPreferences startNode = null; synchronized (lock) { if (isRemoved()) { Modified: harmony/enhanced/classlib/trunk/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java?rev=765529&r1=765528&r2=765529&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java (original) +++ harmony/enhanced/classlib/trunk/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java Thu Apr 16 09:11:55 2009 @@ -553,6 +553,25 @@ assertTrue(pref.nodeExists("child2/grandchild")); } + public void test_nodeExists() throws BackingStoreException { + AbstractPreferences test = (AbstractPreferences) Preferences.userRoot() + .node("test"); + try { + test.nodeExists(null); + fail("should throw NullPointerException"); + } catch (NullPointerException e) { + // Expected + } + + test.removeNode(); + try { + test.nodeExists(null); + fail("should throw NullPointerException"); + } catch (NullPointerException e) { + // Expected + } + } + public void testParent() { assertSame(parent, pref.parent()); AbstractPreferences child1 = new MockAbstractPreferences(pref, "child1");