svn commit: r473580 - in /incubator/harmony/enhanced/drlvm/trunk/vm/vmcore: include/version_svn_tag.h src/jvmti/jvmti_property.cpp

[gs...@apache.org]

Author: gshimansky
Date: Fri Nov 10 15:32:33 2006
New Revision: 473580

URL: http://svn.apache.org/viewvc?view=rev&rev=473580
Log:
Applied HARMONY-2143 [drlvm][jvmti] AddToBootstrapClassLoaderSearch() does not work

Test passed on winxp, acceptance tests passed on winxp and ubuntu


Modified:
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_property.cpp

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h?view=diff&rev=473580&r1=473579&r2=473580
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h Fri Nov 10 15:32:33 2006
@@ -18,6 +18,6 @@
 #ifndef _VERSION_SVN_TAG_
 #define _VERSION_SVN_TAG_
 
-#define VERSION_SVN_TAG  "473417"
+#define VERSION_SVN_TAG  "473506"
 
 #endif // _VERSION_SVN_TAG_

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_property.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_property.cpp?view=diff&rev=473580&r1=473579&r2=473580
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_property.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_property.cpp Fri Nov 10 15:32:33 2006
@@ -31,6 +31,7 @@
 #include "cxxlog.h"
 #include "port_filepath.h"
 #include "suspend_checker.h"
+#include "classpath_const.h"
 
 /*
  * Add To Bootstrap Class Loader Search
@@ -73,12 +74,15 @@
     // destroy temp pool
     apr_pool_destroy(tmp_pool);
 
+    // we'll append segment to -Xbootclasspath/a:
+    const char* bcp_property = XBOOTCLASSPATH_A;
+
     // get bootclasspath property
     Global_Env *g_env = ((TIEnv*)env)->vm->vm_env;
     Properties *properties = g_env->properties;
     const char *bcp_prop = properties_get_string_property(
         reinterpret_cast<PropertiesHandle>(properties),
-        "vm.boot.class.path");
+        bcp_property);
 
     size_t len_bcp = 0;
 
@@ -94,12 +98,12 @@
         strcpy(new_bcp + len_bcp + 1, segment);
 
         // update bootclasspath property
-        add_pair_to_properties(*properties, "vm.boot.class.path", new_bcp);
+        add_pair_to_properties(*properties, bcp_property, new_bcp);
 
         STD_FREE(new_bcp);
     } else {
         // update bootclasspath property
-        add_pair_to_properties(*properties, "vm.boot.class.path", segment);
+        add_pair_to_properties(*properties, bcp_property, segment);
     }
 
     return JVMTI_ERROR_NONE;