diff options
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/lang/natRuntime.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libjava/java/lang/natRuntime.cc b/libjava/java/lang/natRuntime.cc index 9ffeef7ad62..affe27a5fad 100644 --- a/libjava/java/lang/natRuntime.cc +++ b/libjava/java/lang/natRuntime.cc @@ -598,13 +598,20 @@ java::lang::Runtime::insertSystemProperties (java::util::Properties *newprops) // 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. + // If CLASSPATH isn't set or if the path is empty fall back to "." path = newprops->getProperty(JvNewStringLatin1("java.class.path")); if (!path) { char *classpath = getenv("CLASSPATH"); - if (classpath) - SET ("java.class.path", classpath); + if (classpath && classpath[0] != 0) + { + path = JvNewStringLatin1 (classpath); + newprops->put(JvNewStringLatin1 ("java.class.path"), path); + } } + + if (!path || path->length() == 0) + SET ("java.class.path", "."); } java::lang::Process * |
