diff options
| author | Anthony Green <green@redhat.com> | 2004-03-23 19:24:07 +0000 |
|---|---|---|
| committer | Anthony Green <green@gcc.gnu.org> | 2004-03-23 19:24:07 +0000 |
| commit | 95e59f1ada8f85e0aff9bff2748e5c8a763daae3 (patch) | |
| tree | ad582825b89f4622775088c15fb541d03bc615b5 | |
| parent | b1500d001aa58e8712c201ce9fbbad9288a87649 (diff) | |
| download | gcc-95e59f1ada8f85e0aff9bff2748e5c8a763daae3.zip gcc-95e59f1ada8f85e0aff9bff2748e5c8a763daae3.tar.gz gcc-95e59f1ada8f85e0aff9bff2748e5c8a763daae3.tar.bz2 | |
natClass.cc (getClassLoader): Circumvent infinite recursion when searching for the system ClassLoader.
2004-03-21 Anthony Green <green@redhat.com>
* java/lang/natClass.cc (getClassLoader): Circumvent infinite
recursion when searching for the system ClassLoader.
From-SVN: r79871
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/lang/natClass.cc | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ff1aa8d..000a087 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2004-03-21 Anthony Green <green@redhat.com> + + * java/lang/natClass.cc (getClassLoader): Circumvent infinite + recursion when searching for the system ClassLoader. + 2004-03-21 Ito Kazumitsu <kaz@maczuka.gcd.org> * java/net/ServerSocket.java diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc index ba676ab..c11d2a1 100644 --- a/libjava/java/lang/natClass.cc +++ b/libjava/java/lang/natClass.cc @@ -1,6 +1,7 @@ // natClass.cc - Implementation of java.lang.Class native methods. -/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 + Free Software Foundation This file is part of libgcj. @@ -151,7 +152,7 @@ java::lang::Class::getClassLoader (void) // `null' instead. if (isPrimitive ()) return NULL; - return loader ? loader : ClassLoader::getSystemClassLoader (); + return loader ? loader : ClassLoader::systemClassLoader; } java::lang::reflect::Constructor * |