diff options
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/io/PrintStream.java | 2 | ||||
| -rw-r--r-- | libjava/java/lang/natRuntime.cc | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libjava/java/io/PrintStream.java b/libjava/java/io/PrintStream.java index 9480015..8366852 100644 --- a/libjava/java/io/PrintStream.java +++ b/libjava/java/io/PrintStream.java @@ -256,7 +256,7 @@ public class PrintStream extends FilterOutputStream { pw.print (str); - if (auto_flush) + if (str != null && auto_flush) if ((str.indexOf ('\r') != -1) || (str.indexOf ('\n') != -1)) flush (); diff --git a/libjava/java/lang/natRuntime.cc b/libjava/java/lang/natRuntime.cc index 878fccb..b86da32 100644 --- a/libjava/java/lang/natRuntime.cc +++ b/libjava/java/lang/natRuntime.cc @@ -564,7 +564,7 @@ java::lang::Runtime::insertSystemProperties (java::util::Properties *newprops) if (_Jv_Jar_Class_Path) newprops->put(JvNewStringLatin1 ("java.class.path"), - JvNewStringLatin1 (_Jv_Jar_Class_Path)); + JvNewStringLatin1 (_Jv_Jar_Class_Path)); else { // FIXME: find libgcj.zip and append its path? @@ -586,6 +586,9 @@ java::lang::Runtime::insertSystemProperties (java::util::Properties *newprops) sb->toString ()); } + // The path to libgcj's boot classes + SET ("sun.boot.class.path", BOOT_CLASS_PATH); + // The name used to invoke this process (argv[0] in C). SET ("gnu.gcj.progname", _Jv_GetSafeArg (0)); |