From f05bbb6e84f4879fd5d507d645655d7d43cbc603 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 26 Oct 2016 19:49:03 +0200 Subject: [PATCH] Cleanup (formatting) --- .../src/com/intellij/openapi/projectRoots/JdkUtil.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java b/platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java index caad05e81948..607364858410 100644 --- a/platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java +++ b/platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java @@ -223,8 +223,8 @@ public class JdkUtil { private static void appendOldCommandLineWrapper(SimpleJavaParameters javaParameters, GeneralCommandLine commandLine, - ParametersList vmParametersList, Class commandLineWrapper) { - File classpathFile = null; + ParametersList vmParametersList, + Class commandLineWrapper) { File vmParamsFile = null; if (javaParameters.isDynamicVMOptions() && useDynamicVMOptions()) { try { @@ -254,6 +254,8 @@ public class JdkUtil { else { commandLine.addParameters(vmParametersList.getList()); } + + File classpathFile = null; try { classpathFile = FileUtil.createTempFile("classpath", null); final PrintWriter writer = new PrintWriter(classpathFile); @@ -284,6 +286,7 @@ public class JdkUtil { LOG.info(e); throwUnableToCreateTempFile(); } + appendEncoding(javaParameters, commandLine, vmParametersList); commandLine.addParameter(commandLineWrapper.getName()); commandLine.addParameter(classpathFile.getAbsolutePath()); @@ -325,6 +328,7 @@ public class JdkUtil { else { commandLine.addParameters(vmParametersList.getList()); } + if (storeProgramParametersInJar) { manifest.getMainAttributes().putValue("Program-Parameters", ParametersListUtil.join(javaParameters.getProgramParametersList().getList())); }