From 8e37dce7173930b4dcf5d831a6cb7b030db4d513 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Mon, 29 May 2017 18:33:02 +0200
Subject: [PATCH] read ant workspace setting from workspace data only, affects
 IDEA-169055

---
 .../lang/ant/config/impl/AntConfigurationImpl.java     |  7 -------
 .../ant/config/impl/AntWorkspaceConfiguration.java     | 10 +---------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java
index 565a7470fd96..1e3260c791fa 100644
--- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java
+++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java
@@ -216,13 +216,6 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis
   @Override
   public void loadState(Element state) {
     myIsInitialized = Boolean.FALSE;
-    try {
-      myAntWorkspaceConfiguration.loadFromProjectSettings(state);
-    }
-    catch (InvalidDataException e) {
-      LOG.error(e);
-      return;
-    }
 
     List<Pair<Element, String>> files = new ArrayList<>();
     for (Iterator<Element> iterator = state.getChildren(BUILD_FILE).iterator(); iterator.hasNext(); ) {
diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntWorkspaceConfiguration.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntWorkspaceConfiguration.java
index c96c6b84beff..d87695dff037 100644
--- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntWorkspaceConfiguration.java
+++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntWorkspaceConfiguration.java
@@ -69,7 +69,7 @@ public class AntWorkspaceConfiguration implements PersistentStateComponent<Eleme
   }
 
   public void readExternal(Element parentNode) throws InvalidDataException {
-    loadGlobalSettings(parentNode);
+    DefaultJDOMExternalizer.readExternal(this, parentNode);
     myProperties.set(parentNode);
   }
 
@@ -101,14 +101,6 @@ public class AntWorkspaceConfiguration implements PersistentStateComponent<Eleme
     }
   }
 
-  public void loadFromProjectSettings(Element parentNode) throws InvalidDataException {
-    loadGlobalSettings(parentNode);
-  }
-
-  private void loadGlobalSettings(Element parentNode) throws InvalidDataException {
-    DefaultJDOMExternalizer.readExternal(this, parentNode);
-  }
-
   @Nullable
   private static Element findChildByUrl(Element parentNode, String url) {
     for (Element element : parentNode.getChildren(BUILD_FILE)) {