PropertyPermission.java: New version from classpath

2003-04-29  Michael Koch  <konqueror@gmx.de>

	* 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
This commit is contained in:
Michael Koch 2003-04-29 11:36:34 +00:00 committed by Michael Koch
parent cac9b0bcb1
commit fbba7d6850
3 changed files with 40 additions and 6 deletions

View file

@ -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)
{