From: green <green@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 23 Mar 2004 19:24:07 +0000 (+0000)
Subject: 2004-03-21  Anthony Green  <green@redhat.com>
X-Git-Tag: upstream/4.9.2~72108
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8548c4ad9777bf538d830b418f6457d7b7d4ccb1;p=platform%2Fupstream%2Flinaro-gcc.git

2004-03-21  Anthony Green  <green@redhat.com>

        * java/lang/natClass.cc (getClassLoader): Circumvent infinite
        recursion when searching for the system ClassLoader.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@79871 138bc75d-0d04-0410-961f-82ee72b054a4
---

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 *