Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 51778 invoked from network); 9 Oct 2006 05:10:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 9 Oct 2006 05:10:34 -0000 Received: (qmail 17906 invoked by uid 500); 9 Oct 2006 05:09:37 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 15302 invoked by uid 500); 9 Oct 2006 05:09:27 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 9990 invoked by uid 99); 9 Oct 2006 05:09:07 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Oct 2006 22:09:06 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from [140.211.166.113] ([140.211.166.113:58047] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id 78/0A-03466-364C9254 for ; Sun, 08 Oct 2006 20:39:22 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id A93391A981A; Sun, 8 Oct 2006 20:38:35 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r454268 - in /incubator/harmony/enhanced/classlib/trunk/modules/luni/src: main/java/java/util/ResourceBundle.java test/java/tests/api/java/util/MissingResourceExceptionTest.java test/java/tests/api/java/util/ResourceBundleTest.java Date: Mon, 09 Oct 2006 03:38:35 -0000 To: harmony-commits@incubator.apache.org From: ndbeyer@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061009033835.A93391A981A@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: ndbeyer Date: Sun Oct 8 20:38:34 2006 New Revision: 454268 URL: http://svn.apache.org/viewvc?view=rev&rev=454268 Log: Apply patch from HARMONY-1759: [classlib][luni]Compatibility: ClassName of MissingResourceException thorwn in ResourceBundle.getBundle() methods does not contains Locale Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/ResourceBundle.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/MissingResourceExceptionTest.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/ResourceBundleTest.java Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/ResourceBundle.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/ResourceBundle.java?view=diff&rev=454268&r1=454267&r2=454268 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/ResourceBundle.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/ResourceBundle.java Sun Oct 8 20:38:34 2006 @@ -135,7 +135,7 @@ "_" + Locale.getDefault(), true, loader)) != null) { return bundle; } - throw new MissingResourceException(null, bundleName, ""); //$NON-NLS-1$ + throw new MissingResourceException(null, bundleName + '_' + locale, ""); //$NON-NLS-1$ } throw new NullPointerException(); } @@ -161,7 +161,7 @@ if ((bundle = handleGetBundle(bundleName, localeName, true, loader)) != null) { return bundle; } - throw new MissingResourceException(null, bundleName, ""); //$NON-NLS-1$ + throw new MissingResourceException(null, bundleName + '_' + locale , ""); //$NON-NLS-1$ } throw new NullPointerException(); } Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/MissingResourceExceptionTest.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/MissingResourceExceptionTest.java?view=diff&rev=454268&r1=454267&r2=454268 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/MissingResourceExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/MissingResourceExceptionTest.java Sun Oct 8 20:38:34 2006 @@ -17,6 +17,7 @@ package tests.api.java.util; +import java.util.Locale; import java.util.MissingResourceException; import java.util.ResourceBundle; @@ -46,8 +47,8 @@ try { ResourceBundle.getBundle("Non-ExistentBundle"); } catch (MissingResourceException e) { - assertEquals("Returned incorrect class name", "Non-ExistentBundle", e.getClassName() - ); + assertEquals("Returned incorrect class name", "Non-ExistentBundle" + + '_' + Locale.getDefault(), e.getClassName()); } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/ResourceBundleTest.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/ResourceBundleTest.java?view=diff&rev=454268&r1=454267&r2=454268 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/ResourceBundleTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/ResourceBundleTest.java Sun Oct 8 20:38:34 2006 @@ -22,6 +22,7 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.Locale; +import java.util.MissingResourceException; import java.util.ResourceBundle; import java.util.StringTokenizer; import java.util.Vector; @@ -149,6 +150,35 @@ assertEquals("Wrong value child1", "frFRVARChildValue1", bundle.getString("child1")); } + + public void test_getBundle_getClassName() { + // Regression test for Harmony-1759 + Locale locale = Locale.GERMAN; + String nonExistentBundle = "Non-ExistentBundle"; + try { + ResourceBundle.getBundle(nonExistentBundle, locale, this.getClass() + .getClassLoader()); + fail("MissingResourceException expected!"); + } catch (MissingResourceException e) { + assertEquals(nonExistentBundle + "_" + locale, e.getClassName()); + } + + try { + ResourceBundle.getBundle(nonExistentBundle, locale); + fail("MissingResourceException expected!"); + } catch (MissingResourceException e) { + assertEquals(nonExistentBundle + "_" + locale, e.getClassName()); + } + + locale = Locale.getDefault(); + try { + ResourceBundle.getBundle(nonExistentBundle); + fail("MissingResourceException expected!"); + } catch (MissingResourceException e) { + assertEquals(nonExistentBundle + "_" + locale, e.getClassName()); + } + + } protected void setUp() { }