changeset 14481:6276fb427a98

Update JDWP CLassPaths commands to not include bootclasspaths
author alanb
date Sat, 14 Nov 2015 08:23:03 +0000
parents f83388bef364
children c98256f2e102
files src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c src/jdk.jdwp.agent/share/native/libjdwp/util.c src/jdk.jdwp.agent/share/native/libjdwp/util.h
diffstat 3 files changed, 1 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c	Fri Nov 13 22:20:14 2015 -0800
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c	Sat Nov 14 08:23:03 2015 +0000
@@ -823,7 +823,6 @@
 classPaths(PacketInputStream *in, PacketOutputStream *out)
 {
     char *ud;
-    char *bp;
     char *cp;
 
     ud = gdata->property_user_dir;
@@ -834,13 +833,9 @@
     if ( cp == NULL ) {
         cp = "";
     }
-    bp = gdata->property_sun_boot_class_path;
-    if ( bp == NULL ) {
-        bp = "";
-    }
     (void)outStream_writeString(out, ud);
     writePaths(out, cp);
-    writePaths(out, bp);
+    (void)outStream_writeInt(out, 0); // no bootclasspath
     return JNI_TRUE;
 }
 
--- a/src/jdk.jdwp.agent/share/native/libjdwp/util.c	Fri Nov 13 22:20:14 2015 -0800
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/util.c	Sat Nov 14 08:23:03 2015 +0000
@@ -250,8 +250,6 @@
                         = getPropertyUTF8(env, "java.vm.info");
         gdata->property_java_class_path
                         = getPropertyUTF8(env, "java.class.path");
-        gdata->property_sun_boot_class_path
-                        = getPropertyUTF8(env, "sun.boot.class.path");
         gdata->property_sun_boot_library_path
                         = getPropertyUTF8(env, "sun.boot.library.path");
         gdata->property_path_separator
--- a/src/jdk.jdwp.agent/share/native/libjdwp/util.h	Fri Nov 13 22:20:14 2015 -0800
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/util.h	Sat Nov 14 08:23:03 2015 +0000
@@ -113,7 +113,6 @@
     char* property_java_vm_name;          /* UTF8 java.vm.name */
     char* property_java_vm_info;          /* UTF8 java.vm.info */
     char* property_java_class_path;       /* UTF8 java.class.path */
-    char* property_sun_boot_class_path;   /* UTF8 sun.boot.class.path */
     char* property_sun_boot_library_path; /* UTF8 sun.boot.library.path */
     char* property_path_separator;        /* UTF8 path.separator */
     char* property_user_dir;              /* UTF8 user.dir */