From 4b31ce4a17de26f1083efd1ea0e36cbb8a3d53ec Mon Sep 17 00:00:00 2001 From: Staffan Larsen Date: Tue, 1 Jul 2014 10:40:14 +0200 Subject: [PATCH] 8048687: [TESTBUG] com/sun/jdi/ExclusiveBind.java "Could not find or load main class" Reviewed-by: jbachorik, egahlin, dholmes --- jdk/test/com/sun/jdi/ExclusiveBind.java | 4 +++- jdk/test/com/sun/jdi/VMConnection.java | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/jdk/test/com/sun/jdi/ExclusiveBind.java b/jdk/test/com/sun/jdi/ExclusiveBind.java index 40a42d0e16d..a4801fa4ab6 100644 --- a/jdk/test/com/sun/jdi/ExclusiveBind.java +++ b/jdk/test/com/sun/jdi/ExclusiveBind.java @@ -68,7 +68,9 @@ public class ExclusiveBind { private static ProcessBuilder prepareLauncher(String address, boolean suspend, String class_name) throws Exception { List args = new ArrayList<>(); for(String dbgOption : VMConnection.getDebuggeeVMOptions().split(" ")) { - args.add(dbgOption); + if (!dbgOption.trim().isEmpty()) { + args.add(dbgOption); + } } String lib = "-agentlib:jdwp=transport=dt_socket,server=y,suspend="; if (suspend) { diff --git a/jdk/test/com/sun/jdi/VMConnection.java b/jdk/test/com/sun/jdi/VMConnection.java index e0d72758661..2df2e63057e 100644 --- a/jdk/test/com/sun/jdi/VMConnection.java +++ b/jdk/test/com/sun/jdi/VMConnection.java @@ -59,13 +59,13 @@ class VMConnection { retVal += "-classpath " + testClasses; String vmOpts = System.getProperty("test.vm.opts"); - System.out.println("vmOpts: "+vmOpts); - if (vmOpts != null) { + System.out.println("vmOpts: '" + vmOpts + "'"); + if (vmOpts != null && !vmOpts.trim().isEmpty()) { retVal += " " + vmOpts; } String javaOpts = System.getProperty("test.java.opts"); - System.out.println("javaOpts: "+javaOpts); - if (javaOpts != null) { + System.out.println("javaOpts: '" + javaOpts + "'"); + if (javaOpts != null && !javaOpts.trim().isEmpty()) { retVal += " " + javaOpts; }