harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r499047 - in /harmony/enhanced/drlvm/trunk/vm: em/src/DrlEMImpl.cpp vmcore/src/jvmti/jvmti.cpp
Date Tue, 23 Jan 2007 15:09:36 GMT
Author: gshimansky
Date: Tue Jan 23 07:09:35 2007
New Revision: 499047

URL: http://svn.apache.org/viewvc?view=rev&rev=499047
Log:
Applied HARMONY-3027 [drlvm][jvmti] VM fails to initialize wtih an agent specified by -agentlib:
option

Tests passed on Ubuntu6 x86, Windows 2003 server x86 and SuSE9 x86_64.
The agentlib option seems to work now


Modified:
    harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp?view=diff&rev=499047&r1=499046&r2=499047
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp Tue Jan 23 07:09:35 2007
@@ -182,7 +182,7 @@
  *  deprecated
  */
 std::string buildDefaultLibPath(const std::string& dll_name) {
-    char* c_string_tmp_value = get_property("vm.boot.library.path", VM_PROPERTIES);
+    char* c_string_tmp_value = get_property("vm.boot.library.path", JAVA_PROPERTIES);
     std::string library_path = c_string_tmp_value == NULL ? "" : c_string_tmp_value;
     destroy_property_value(c_string_tmp_value);
 #ifdef PLATFORM_NT

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti.cpp?view=diff&rev=499047&r1=499046&r2=499047
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti.cpp Tue Jan 23 07:09:35 2007
@@ -491,7 +491,7 @@
                                        const char *lib_name,
                                        char **p_path1, char **p_path2)
 {
-    char *vm_libs = vm->vm_env->VmProperties()->get("vm.boot.library.path");
+    char *vm_libs = vm->vm_env->JavaProperties()->get("vm.boot.library.path");
     assert(vm_libs);
     char *path1 = apr_pstrdup(pool, vm_libs);
     char *path2 = port_dso_name_decorate(lib_name, pool);



Mime
View raw message