OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

natRuntime.cc (insertSystemProperties): Set java.class.path to CLASSPATH if not already set.

Browse Source 
* java/lang/natRuntime.cc (insertSystemProperties): Set
       java.class.path to CLASSPATH if not already set.

From-SVN: r98099
This commit is contained in:
Mark Wielaard 2005-04-13 16:46:47 +00:00 committed by Mark Wielaard
parent 23a8ae8d46
commit f5e002ce85
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
2005-04-13 Mark Wielaard <mark@klomp.org>
* java/lang/natRuntime.cc (insertSystemProperties): Set
java.class.path to CLASSPATH if not already set.
2005-04-07 Thomas Fitzsimmons <fitzsim@redhat.com>
* prims.cc (parse_verbose_args): Fix verbose argument parsing.

12
libjava/java/lang/natRuntime.cc
View File

@ -593,6 +593,18 @@ java::lang::Runtime::insertSystemProperties (java::util::Properties *newprops)
// LD_LIBRARY_PATH, etc.
SET ("java.library.path", "");
}
// If java.class.path is still not set then set it according to the
// CLASSPATH environment variable if given. See gij.cc main () and
// prims.cc _Jv_CreateJavaVM () for all the ways this could have
// been set much earlier.
path = newprops->getProperty(JvNewStringLatin1("java.class.path"));
if (!path)
{
char *classpath = getenv("CLASSPATH");
if (classpath)
SET ("java.class.path", classpath);
}
}
java::lang::Process *