Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 29651 invoked from network); 24 Dec 2006 03:02:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Dec 2006 03:02:35 -0000 Received: (qmail 56053 invoked by uid 500); 24 Dec 2006 03:02:42 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 56030 invoked by uid 500); 24 Dec 2006 03:02:42 -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 56021 invoked by uid 99); 24 Dec 2006 03:02:42 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Dec 2006 19:02:42 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Dec 2006 19:02:34 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 2AF801A981A; Sat, 23 Dec 2006 19:01:44 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r489969 - 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: Sun, 24 Dec 2006 03:01:44 -0000 To: commits@harmony.apache.org From: ndbeyer@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061224030144.2AF801A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ndbeyer Date: Sat Dec 23 19:01:43 2006 New Revision: 489969 URL: http://svn.apache.org/viewvc?view=rev&rev=489969 Log: Apply patch for HARMONY-2420: [classlib][prefs] java.util.prefs.AbstractPreferences.exportNode(OutputStream) and java.util.prefs.AbstractPreferences.exportSubtree(OutputStream) throws AssertionError instead of NPE in a case when OutputStream is null 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?view=diff&rev=489969&r1=489968&r2=489969 ============================================================================== --- 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 Sat Dec 23 19:01:43 2006 @@ -373,7 +373,7 @@ BackingStoreException { if(ostream == null) { // prefs.5=Stream is null - throw new AssertionError(Messages.getString("prefs.5")); //$NON-NLS-1$ + throw new NullPointerException(Messages.getString("prefs.5")); //$NON-NLS-1$ } checkState(); XMLParser.exportPrefs(this, ostream, false); @@ -388,9 +388,8 @@ BackingStoreException { if(ostream == null) { // prefs.5=Stream is null - throw new AssertionError(Messages.getString("prefs.5")); //$NON-NLS-1$ + throw new NullPointerException(Messages.getString("prefs.5")); //$NON-NLS-1$ } - checkState(); XMLParser.exportPrefs(this, ostream, true); } 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?view=diff&rev=489969&r1=489968&r2=489969 ============================================================================== --- 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 Sat Dec 23 19:01:43 2006 @@ -1005,7 +1005,8 @@ try { pref.exportNode(null); fail(); - } catch (AssertionError e) { + } catch (NullPointerException e) { + // Expected } pref.putBoolean("key", false); @@ -1069,7 +1070,8 @@ try { pref.exportSubtree(null); fail(); - } catch (AssertionError e) { + } catch (NullPointerException e) { + // Expected } ByteArrayOutputStream out = new ByteArrayOutputStream(); pref.putBoolean("key", false);