diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-10-22 19:43:41 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-10-22 19:43:41 +0000 |
| commit | 4046fa64423098f281f902e31c70673cc022ec08 (patch) | |
| tree | 5b2911a12a79d2934e95d0632e658c09f9826b4a /libjava/java | |
| parent | cb4952eb366794dedfb16f70a120a4393be1c567 (diff) | |
| download | ppe42-gcc-4046fa64423098f281f902e31c70673cc022ec08.tar.gz ppe42-gcc-4046fa64423098f281f902e31c70673cc022ec08.zip | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@30133 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/lang/natClassLoader.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index ee5f2e78e85..2a73ba69053 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 |
