harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r481188 - /harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp
Date Fri, 01 Dec 2006 08:54:22 GMT
Author: varlax
Date: Fri Dec  1 00:54:21 2006
New Revision: 481188

URL: http://svn.apache.org/viewvc?view=rev&rev=481188
Log:
Fixed HUT regression since r480913.
Bad "java.ext.dirs" value was provided.
Tested on SUSE9

Modified:
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp?view=diff&rev=481188&r1=481187&r2=481188
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp Fri Dec  1 00:54:21
2006
@@ -149,7 +149,14 @@
     if (NULL == p)
         DIE("Failed to determine executable parent directory");
     *p = '\0';
-    properties.set("java.home", base_path_buf);
+    // home directory
+    char* home_path = apr_pstrdup(prop_pool, base_path_buf);
+    p = strrchr(home_path, PORT_FILE_SEPARATOR);
+    if (NULL == p)
+        DIE("Failed to determine java home directory");
+    *p = '\0';
+
+    properties.set("java.home", home_path);
     properties.set("java.vm.specification.version", "1.0");
     properties.set("java.vm.specification.vendor", "Sun Microsystems Inc.");
     properties.set("java.vm.specification.name", "Java Virtual Machine Specification");
@@ -174,7 +181,7 @@
     }
     properties.set("java.library.path", lib_path);
     //java.ext.dirs initialization.
-    char *ext_path = port_filepath_merge(base_path_buf, "lib" PORT_FILE_SEPARATOR_STR "ext",
prop_pool);
+    char *ext_path = port_filepath_merge(home_path, "lib" PORT_FILE_SEPARATOR_STR "ext",
prop_pool);
     properties.set("java.ext.dirs", ext_path);
     properties.set("os.name", os_name);
     properties.set("os.arch", port_CPU_architecture());



Mime
View raw message