aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2007-02-01 23:00:01 +0000
committerTom Tromey <tromey@gcc.gnu.org>2007-02-01 23:00:01 +0000
commit14a9874595f49f9215f8639405ad49d80403b07d (patch)
tree3021f930008b97aff7f92b3711c74ea6c6c2cc49 /libjava
parent4d2446d99e1b97108188fcc3de70eaffcc46bc9f (diff)
downloadgcc-14a9874595f49f9215f8639405ad49d80403b07d.zip
gcc-14a9874595f49f9215f8639405ad49d80403b07d.tar.gz
gcc-14a9874595f49f9215f8639405ad49d80403b07d.tar.bz2
* java/lang/ClassLoader.java (getResources): No longer final.
From-SVN: r121475
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog4
-rw-r--r--libjava/classpath/lib/java/lang/ClassLoader.classbin12510 -> 12510 bytes
-rw-r--r--libjava/java/lang/ClassLoader.java2
3 files changed, 5 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6e62fff..6cf0bda 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,9 @@
2007-02-01 Tom Tromey <tromey@redhat.com>
+ * java/lang/ClassLoader.java (getResources): No longer final.
+
+2007-02-01 Tom Tromey <tromey@redhat.com>
+
* java/util/logging/LogManager.java (loggers): Genericized.
(addLogger): Merged.
(findAncestor): Likewise.
diff --git a/libjava/classpath/lib/java/lang/ClassLoader.class b/libjava/classpath/lib/java/lang/ClassLoader.class
index 59ba15c..c0961d1 100644
--- a/libjava/classpath/lib/java/lang/ClassLoader.class
+++ b/libjava/classpath/lib/java/lang/ClassLoader.class
Binary files differ
diff --git a/libjava/java/lang/ClassLoader.java b/libjava/java/lang/ClassLoader.java
index 92b2f0a..4682dbb 100644
--- a/libjava/java/lang/ClassLoader.java
+++ b/libjava/java/lang/ClassLoader.java
@@ -736,7 +736,7 @@ public abstract class ClassLoader
* @since 1.2
* @specnote this was <code>final</code> prior to 1.5
*/
- public final Enumeration<URL> getResources(String name) throws IOException
+ public Enumeration<URL> getResources(String name) throws IOException
{
Enumeration<URL> parentResources;
if (parent == null)