From d17dc3f4752503c72069029a6d40dd156f80e0ca Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Thu, 5 Nov 2015 15:36:47 +0300
Subject: [PATCH] older projects compatibility: read build process heap size
 from workspace.xml as a fallback value (IDEA-147362)

---
 .../src/com/intellij/compiler/CompilerConfigurationImpl.java | 5 +++++
 .../intellij/compiler/CompilerWorkspaceConfiguration.java    | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java b/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java
index 9f701721e4f0..05c27526775a 100644
--- a/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java
+++ b/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java
@@ -685,6 +685,11 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements
           break;
         }
       }
+      if (myState.BUILD_PROCESS_HEAP_SIZE == DEFAULT_BUILD_PROCESS_HEAP_SIZE) {
+        final CompilerWorkspaceConfiguration workspace = CompilerWorkspaceConfiguration.getInstance(myProject);
+        // older version compatibility: as a fallback load this setting from workspace 
+        myState.BUILD_PROCESS_HEAP_SIZE = workspace.COMPILER_PROCESS_HEAP_SIZE; 
+      }
     }
 
     final Element notNullAssertions = parentNode.getChild(JpsJavaCompilerConfigurationSerializer.ADD_NOTNULL_ASSERTIONS);
diff --git a/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java b/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java
index 74ad7cfae9b1..27831b7043b2 100644
--- a/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java
+++ b/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java
@@ -45,6 +45,11 @@ public class CompilerWorkspaceConfiguration implements PersistentStateComponent<
   public boolean CLEAR_OUTPUT_DIRECTORY = true;
   public boolean MAKE_PROJECT_ON_SAVE = false; // until we fix problems with several open projects (IDEA-104064), daemon slowness (IDEA-104666)
   public boolean PARALLEL_COMPILATION = false;
+  /**
+   * @Deprecated. Use corresponding value from CompilerConfiguration
+   * This field is left here for compatibility with older projects
+   */
+  public int COMPILER_PROCESS_HEAP_SIZE = 700;
   public String COMPILER_PROCESS_ADDITIONAL_VM_OPTIONS = "";
   public boolean REBUILD_ON_DEPENDENCY_CHANGE = true;