diff src/os/linux/vm/os_linux.cpp @ 2181:d25d4ca69222

Merge.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Wed, 16 Feb 2011 13:47:20 +0100
parents 06f017f7daa7 34d64ad817f4
children 0cd39a385a72
line wrap: on
line diff
--- a/src/os/linux/vm/os_linux.cpp	Wed Feb 16 13:38:33 2011 +0100
+++ b/src/os/linux/vm/os_linux.cpp	Wed Feb 16 13:47:20 2011 +0100
@@ -1610,10 +1610,9 @@
 
 const char* os::dll_file_extension() { return ".so"; }
 
-const char* os::get_temp_directory() {
-  const char *prop = Arguments::get_property("java.io.tmpdir");
-  return prop == NULL ? "/tmp" : prop;
-}
+// This must be hard coded because it's the system's temporary
+// directory not the java application's temp directory, ala java.io.tmpdir.
+const char* os::get_temp_directory() { return "/tmp"; }
 
 static bool file_exists(const char* filename) {
   struct stat statbuf;