diff options
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/lang/natRuntime.cc | 11 |
2 files changed, 15 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 37cb8d9..5e9d810 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2005-04-19 Mark Wielaard <mark@klomp.org> + + * java/lang/natRuntime.cc (insertSystemProperties): Set + java.class.path to CLASSPATH only when not empty. Fall back to + default path "." when java.class.path is empty. + 2005-04-19 Michael Koch <konqueror@gmx.de> * javax/swing/text/rtf/ControlWordToken.java, diff --git a/libjava/java/lang/natRuntime.cc b/libjava/java/lang/natRuntime.cc index 9ffeef7..affe27a 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 * |