From ccb64b56b2830a37b3d341d0d1804aa68cfd4c76 Mon Sep 17 00:00:00 2001 From: Artem Smotrakov Date: Wed, 6 May 2015 09:22:03 +0800 Subject: [PATCH] 8076486: [TESTBUG] javax/security/auth/Subject/doAs/NestedActions.java fails if extra VM options are given Reviewed-by: weijun --- jdk/test/javax/security/auth/Subject/doAs/NestedActions.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jdk/test/javax/security/auth/Subject/doAs/NestedActions.java b/jdk/test/javax/security/auth/Subject/doAs/NestedActions.java index bde0aed1112..2718e7a4b33 100644 --- a/jdk/test/javax/security/auth/Subject/doAs/NestedActions.java +++ b/jdk/test/javax/security/auth/Subject/doAs/NestedActions.java @@ -34,6 +34,7 @@ import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; @@ -144,7 +145,7 @@ public class NestedActions { } cmds.add(sb.toString()); if (JAVA_OPTS != null && !JAVA_OPTS.isEmpty()) { - cmds.add(JAVA_OPTS); + Collections.addAll(cmds, JAVA_OPTS.trim().split("\\s+")); } cmds.add("-Djava.security.manager"); cmds.add("-Djava.security.policy=" + TEST_SOURCES + FS + args[1]);