diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildFileImpl.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildFileImpl.java
index 3078230bfbe3..c4ec2d0d4aed 100644
--- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildFileImpl.java
+++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildFileImpl.java
@@ -175,8 +175,9 @@ public class AntBuildFileImpl implements AntBuildFileBase {
     myProjectOptions.registerProperty(ADDITIONAL_CLASSPATH, "entry", SinglePathEntry.EXTERNALIZER);
     myProjectOptions.registerProperty(ANT_REFERENCE, AntReference.EXTERNALIZER);
 
-    myAllOptions = new CompositePropertyContainer(new AbstractProperty.AbstractPropertyContainer[]{myWorkspaceOptions, myProjectOptions,
-      GlobalAntConfiguration.getInstance().getProperties(getProject())});
+    myAllOptions = new CompositePropertyContainer(new AbstractProperty.AbstractPropertyContainer[]{
+      myWorkspaceOptions, myProjectOptions, GlobalAntConfiguration.getInstance().getProperties(), configuration.getProperties()
+    });
 
     myClassloaderHolder = new AntBuildFileClassLoaderHolder(myAllOptions);
   }
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 81b445f4f495..450acadd1006 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
@@ -640,6 +640,7 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis
     final Semaphore targetDone = new Semaphore();
     targetDone.down();
     final Ref<Boolean> result = Ref.create(Boolean.FALSE);
+    //noinspection SSBasedInspection
     SwingUtilities.invokeLater(new Runnable() {
       public void run() {
         try {
diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/GlobalAntConfiguration.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/GlobalAntConfiguration.java
index 88901c7a61fa..d3d7bd933106 100644
--- a/plugins/ant/src/com/intellij/lang/ant/config/impl/GlobalAntConfiguration.java
+++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/GlobalAntConfiguration.java
@@ -20,7 +20,6 @@ import com.intellij.lang.ant.AntBundle;
 import com.intellij.lang.ant.config.AntBuildFile;
 import com.intellij.lang.ant.config.AntBuildTarget;
 import com.intellij.lang.ant.config.AntConfiguration;
-import com.intellij.lang.ant.config.AntConfigurationBase;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.ServiceManager;
@@ -125,11 +124,6 @@ public class GlobalAntConfiguration implements PersistentStateComponent<Element>
     return myProperties;
   }
 
-  public AbstractProperty.AbstractPropertyContainer getProperties(Project project) {
-    return new CompositePropertyContainer(new AbstractProperty.AbstractPropertyContainer[]{
-      myProperties, AntConfigurationBase.getInstance(project).getProperties()});
-  }
-
   public void addConfiguration(final AntInstallation ant) {
     if (getConfiguredAnts().containsKey(ant.getReference())) {
       LOG.error("Duplicate name: " + ant.getName());