From fbba7d685098eb2173db34b4e2dab4118cd47edb Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Tue, 29 Apr 2003 11:36:34 +0000 Subject: PropertyPermission.java: New version from classpath 2003-04-29 Michael Koch * java/util/PropertyPermission.java: New version from classpath * java/util/ResourceBundle.java: Partly merged from classpath (getObject): Reformated. (tryBundle): Set foundBundle = null if no bundle found. From-SVN: r66214 --- libjava/java/util/ResourceBundle.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'libjava/java/util/ResourceBundle.java') diff --git a/libjava/java/util/ResourceBundle.java b/libjava/java/util/ResourceBundle.java index 2a4e348..7a4a282 100644 --- a/libjava/java/util/ResourceBundle.java +++ b/libjava/java/util/ResourceBundle.java @@ -1,5 +1,5 @@ /* ResourceBundle -- aids in loading resource bundles - Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -182,8 +182,9 @@ public abstract class ResourceBundle catch (MissingResourceException ex) { } - throw new MissingResourceException("Key not found", - getClass().getName(), key); + + throw new MissingResourceException("Key not found", getClass().getName(), + key); } /** @@ -470,6 +471,7 @@ public abstract class ResourceBundle catch (Exception ex) { // ignore them all + foundBundle = null; } if (foundBundle == null) { -- cgit v1.1