MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

@vm_params place when using force dynamic vm options fixed (IDEA-97769)

Browse Source
This commit is contained in:
anna
2013-01-16 13:46:31 +01:00
parent eb3f15d745
commit 2725ca8e99
1 changed files with 33 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java
+33 -39
View File
@@ -167,43 +167,38 @@ public class JdkUtil {
final Class commandLineWrapper;
if ((commandLineWrapper = getCommandLineWrapperClass()) != null) {
if (javaParameters.isDynamicVMOptions() && useDynamicVMOptions()) {
if (forceDynamicClasspath) {
File classpathFile = null;
File vmParamsFile = null;
try {
vmParamsFile = FileUtil.createTempFile("vm_params", null);
final PrintWriter writer = new PrintWriter(vmParamsFile);
try {
for (String param : vmParametersList.getList()) {
if (param.startsWith("-D")) {
writer.println(param);
if (!vmParametersList.hasParameter("-classpath") && !vmParametersList.hasParameter("-cp")) {
if (javaParameters.isDynamicVMOptions() && useDynamicVMOptions()) {
try {
vmParamsFile = FileUtil.createTempFile("vm_params", null);
final PrintWriter writer = new PrintWriter(vmParamsFile);
try {
for (String param : vmParametersList.getList()) {
if (param.startsWith("-D")) {
writer.println(param);
}
}
}
finally {
writer.close();
}
}
catch (IOException e) {
LOG.error(e);
}
final List<String> list = vmParametersList.getList();
for (String param : list) {
if (!param.trim().startsWith("-D")) {
commandLine.addParameter(param);
}
}
}
finally {
writer.close();
else {
commandLine.addParameters(vmParametersList.getList());
}
}
catch (IOException e) {
LOG.error(e);
}
final List<String> list = vmParametersList.getList();
for (String param : list) {
if (!param.trim().startsWith("-D")) {
commandLine.addParameter(param);
}
}
commandLine.addParameter("@vm_params");
commandLine.addParameter(vmParamsFile.getAbsolutePath());
}
else {
commandLine.addParameters(vmParametersList.getList());
}
if (forceDynamicClasspath) {
File classpathFile = null;
if (!vmParametersList.hasParameter("-classpath") && !vmParametersList.hasParameter("-cp")) {
try {
classpathFile = FileUtil.createTempFile("classpath", null);
final PrintWriter writer = new PrintWriter(classpathFile);
@@ -240,9 +235,14 @@ public class JdkUtil {
commandLine.addParameter(commandLineWrapper.getName());
commandLine.addParameter(classpathFile.getAbsolutePath());
}
if (vmParamsFile != null) {
commandLine.addParameter("@vm_params");
commandLine.addParameter(vmParamsFile.getAbsolutePath());
}
}
else {
appendEncodingClasspath(javaParameters, commandLine, vmParametersList);
appendParamsEncodingClasspath(javaParameters, commandLine, vmParametersList);
}
}
else {
@@ -262,12 +262,6 @@ public class JdkUtil {
GeneralCommandLine commandLine,
ParametersList parametersList) {
commandLine.addParameters(parametersList.getList());
appendEncodingClasspath(javaParameters, commandLine, parametersList);
}
private static void appendEncodingClasspath(SimpleJavaParameters javaParameters,
GeneralCommandLine commandLine,
ParametersList parametersList) {
appendEncoding(javaParameters, commandLine, parametersList);
if (!parametersList.hasParameter("-classpath") && !parametersList.hasParameter("-cp")){
commandLine.addParameter("-classpath");