mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-04 00:20:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

prims.cc (_Jv_RunMain): Use `using' to simplify code.

Browse Source 
* prims.cc (_Jv_RunMain): Use `using' to simplify code.  Set
	_Jv_Jar_Class_Path early.

From-SVN: r47965
This commit is contained in:
Tom Tromey 2001-12-13 04:19:36 +00:00 committed by Tom Tromey
parent a0de9d2025
commit 4e41d14893
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libjava/ChangeLog
View File

@ -1,5 +1,8 @@
2001-12-12 Tom Tromey <tromey@redhat.com>
* prims.cc (_Jv_RunMain): Use `using' to simplify code. Set
_Jv_Jar_Class_Path early.
* jni.cc (call): Synchronize if required.
* gij.cc (main): Clarify --help output.

20
libjava/prims.cc
View File

@ -994,6 +994,10 @@ _Jv_RunMain (jclass klass, const char *name, int argc, const char **argv,
try
{
// Set this very early so that it is seen when java.lang.System
// is initialized.
if (is_jar)
_Jv_Jar_Class_Path = strdup (name);
_Jv_CreateJavaVM (NULL);
// Get the Runtime here. We want to initialize it before searching
@ -1002,20 +1006,12 @@ _Jv_RunMain (jclass klass, const char *name, int argc, const char **argv,
arg_vec = JvConvertArgv (argc - 1, argv + 1);
using namespace gnu::gcj::runtime;
if (klass)
main_thread = new gnu::gcj::runtime::FirstThread (klass, arg_vec);
main_thread = new FirstThread (klass, arg_vec);
else
main_thread = new gnu::gcj::runtime::FirstThread
(JvNewStringLatin1 (name), arg_vec, is_jar);
if (is_jar)
{
// We need a new ClassLoader because the classpath must be the
// jar file only. The easiest way to do this is to lose our
// reference to the previous classloader.
_Jv_Jar_Class_Path = strdup (name);
gnu::gcj::runtime::VMClassLoader::instance = NULL;
}
main_thread = new FirstThread (JvNewStringLatin1 (name),
arg_vec, is_jar);
}
catch (java::lang::Throwable *t)
{