From 5d19c56af2845b1d384ad4096cf7c478c9ae729f Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Tue, 16 Oct 2012 11:36:06 +0200 Subject: [PATCH] remove hard-coded non-standard jvm options --- .../impl/src/com/intellij/compiler/server/BuildManager.java | 4 ++-- .../com/intellij/compiler/CompilerWorkspaceConfiguration.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java index 50cd59e5b758..5c4f66307ede 100644 --- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java +++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java @@ -720,8 +720,8 @@ public class BuildManager implements ApplicationComponent{ final GeneralCommandLine cmdLine = new GeneralCommandLine(); final String vmExecutablePath = ((JavaSdkType)projectJdk.getSdkType()).getVMExecutablePath(projectJdk); cmdLine.setExePath(vmExecutablePath); - cmdLine.addParameter("-XX:MaxPermSize=150m"); - cmdLine.addParameter("-XX:ReservedCodeCacheSize=64m"); + //cmdLine.addParameter("-XX:MaxPermSize=150m"); + //cmdLine.addParameter("-XX:ReservedCodeCacheSize=64m"); final int heapSize = config.COMPILER_PROCESS_HEAP_SIZE; final int xms = heapSize / 2; if (xms > 32) { diff --git a/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java b/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java index 903bf499fb1b..520af37478f5 100644 --- a/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java +++ b/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java @@ -39,7 +39,7 @@ public class CompilerWorkspaceConfiguration implements PersistentStateComponent< public boolean MAKE_PROJECT_ON_SAVE = false; public boolean PARALLEL_COMPILATION = false; public int COMPILER_PROCESS_HEAP_SIZE = 700; - public String COMPILER_PROCESS_ADDITIONAL_VM_OPTIONS = ""; + public String COMPILER_PROCESS_ADDITIONAL_VM_OPTIONS = "-XX:MaxPermSize=150m"; public static CompilerWorkspaceConfiguration getInstance(Project project) { return ServiceManager.getService(project, CompilerWorkspaceConfiguration.class);