From b8c3c4f0146f82c900a995c8e98b83a2147115fd Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@cygnus.com>
Date: Fri, 22 Oct 1999 19:43:41 +0000
Subject: Makefile.in: Rebuilt.

	* Makefile.in: Rebuilt.
	* Makefile.am (java/lang/ClassLoader.h): New target.
	* java/lang/natClassLoader.cc (_Jv_FindClass): Removed reference
	to `redirect'.

	* include/java-props.h (_Jv_Compiler_Properties): Changed
	declaration.
	* gcj/array.h (JvRunMain, _Jv_RunMain): Don't declare.
	* include/jvm.h (_Jv_GCSetInitialHeapSize,
	_Jv_GCSetMaximumHeapSize): Declare.
	(JvRunMain, _Jv_RunMain): Declare.
	(_Jv_SetMaximumHeapSize, _Jv_SetInitialHeapSize): Declare.
	* nogc.cc (_Jv_GCSetInitialHeapSize): New function.
	(_Jv_GCSetMaximumHeapSize): Likewise.
	* boehm.cc (_Jv_GCSetInitialHeapSize): New function.
	(_Jv_GCSetMaximumHeapSize): Likewise.
	* prims.cc (parse_heap_size): New function.
	(_Jv_SetInitialHeapSize): Likewise.
	(_Jv_SetMaximumHeapSize): Likewise.
	(_Jv_Compiler_Properties): New global.
	* gij.cc (help): New function.
	(version): Likewise.
	(heap_size): Likewise.
	(heap_max_size): Likewise.
	(main): Parse arguments.  Set _Jv_Compiler_Properties.
	Include <config.h>, <java-props.h>.
	(_Jv_Compiler_Properties): Removed.

From-SVN: r30133
---
 libjava/java/lang/natClassLoader.cc | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'libjava/java')

diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc
index ee5f2e7..2a73ba6 100644
--- a/libjava/java/lang/natClassLoader.cc
+++ b/libjava/java/lang/natClassLoader.cc
@@ -447,20 +447,19 @@ jclass _Jv_FindClass (_Jv_Utf8Const *name,
 	}
       else 
 	{
-	  if (redirect == NULL)
+	  java::lang::ClassLoader *sys = java::lang::ClassLoader::system;
+	  if (sys == NULL)
 	    {
 	      _Jv_InitClass (&ClassLoaderClass);
-	      java::lang::ClassLoader::getSystemClassLoader ();
+	      sys = java::lang::ClassLoader::getSystemClassLoader ();
 	    }
 
-	  // Load using the bootstrap loader jmspec 5.3.1
-	  klass = redirect -> loadClass (sname, false); 
+	  // Load using the bootstrap loader jmspec 5.3.1.
+	  klass = sys->loadClass (sname, false); 
 
-	  // register that we're an initiating loader
+	  // Register that we're an initiating loader.
 	  if (klass)
-	    {
-	      _Jv_RegisterInitiatingLoader (klass, 0);
-	    }
+	    _Jv_RegisterInitiatingLoader (klass, 0);
 	}
     }
   else
-- 
cgit v1.1