From 0423f9af85e6dadd501c7bf7f4da64dee6a44a36 Mon Sep 17 00:00:00 2001 From: "Denis.Zhdanov" Date: Fri, 24 Feb 2012 14:03:48 +0400 Subject: [PATCH] IDEA-81581 Gradle project failure w/ 11.1 EAP Don't perform double 'refresh gradle project' --- .../sync/GradleProjectStructureChangesDetector.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesDetector.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesDetector.java index 11baf98bbe71..d7980fc22a90 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesDetector.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesDetector.java @@ -3,12 +3,15 @@ package org.jetbrains.plugins.gradle.sync; import com.intellij.ProjectTopics; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.components.AbstractProjectComponent; +import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ModuleRootEvent; import com.intellij.openapi.roots.ModuleRootListener; import com.intellij.util.Alarm; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.plugins.gradle.task.GradleTaskManager; +import org.jetbrains.plugins.gradle.task.GradleTaskType; import org.jetbrains.plugins.gradle.util.GradleUtil; import java.util.concurrent.TimeUnit; @@ -59,6 +62,11 @@ public class GradleProjectStructureChangesDetector extends AbstractProjectCompon return; } myAlarm.cancelAllRequests(); + final GradleTaskManager taskManager = ServiceManager.getService(GradleTaskManager.class); + if (taskManager != null && taskManager.hasTaskOfTypeInProgress(GradleTaskType.RESOLVE_PROJECT)) { + return; + } + final long diff = System.currentTimeMillis() - myStartRefreshTime.get(); if (diff < 0) { myAlarm.cancelAllRequests();