From 7db25209bab7f4db0cf83fb20ed5ab4ab93b855d Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Mon, 3 Apr 2017 17:15:46 +0300
Subject: [PATCH] Fix externalSystemTaskExecutionSettings serialization

---
 .../execution/ExternalSystemTaskExecutionSettings.java     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/execution/ExternalSystemTaskExecutionSettings.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/execution/ExternalSystemTaskExecutionSettings.java
index eff6bb7e7096..f0a187b7267b 100644
--- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/execution/ExternalSystemTaskExecutionSettings.java
+++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/execution/ExternalSystemTaskExecutionSettings.java
@@ -25,7 +25,6 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -50,7 +49,7 @@ public class ExternalSystemTaskExecutionSettings implements Cloneable {
   private String myExternalProjectPath;
   private String myVmOptions;
   private String myScriptParameters;
-  private Map<String, String> myEnv;
+  private Map<String, String> myEnv = ContainerUtilRt.newHashMap();
   private boolean myPassParentEnvs = true;
 
   @Nullable
@@ -116,11 +115,11 @@ public class ExternalSystemTaskExecutionSettings implements Cloneable {
 
   @NotNull
   public Map<String, String> getEnv() {
-    return myEnv == null ? Collections.emptyMap() : myEnv;
+    return myEnv;
   }
 
   public void setEnv(Map<String, String> env) {
-    myEnv = env;
+    myEnv = env == null ? ContainerUtilRt.newHashMap() : env;
   }
 
   public boolean isPassParentEnvs() {