From 3234c0b77f3a20b58af1048c5790f46e0865dbf0 Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Tue, 21 Jan 2014 17:58:34 +0400 Subject: [PATCH] IDEA-119336 Gradle build files: build.gradle scripts are checkout from Perforce even if the file is not changed --- .../integrations/maven/ImportMavenRepositoriesTask.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/maven/ImportMavenRepositoriesTask.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/maven/ImportMavenRepositoriesTask.java index 54e898b96649..5250d285d47e 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/maven/ImportMavenRepositoriesTask.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/maven/ImportMavenRepositoriesTask.java @@ -15,6 +15,7 @@ */ package org.jetbrains.plugins.gradle.integrations.maven; +import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.application.Result; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.externalSystem.util.ExternalSystemConstants; @@ -98,9 +99,9 @@ public class ImportMavenRepositoriesTask implements Runnable { final PsiFile[] psiFiles = ArrayUtil.toObjectArray(psiFileList, PsiFile.class); - final Set mavenRemoteRepositories = new WriteCommandAction>(myProject, psiFiles) { + final Set mavenRemoteRepositories = new ReadAction>() { @Override - protected void run(Result> result) throws Throwable { + protected void run(@NotNull Result> result) throws Throwable { Set myRemoteRepositories = ContainerUtil.newHashSet(); for (PsiFile psiFile : psiFiles) { List repositoriesBlocks = ContainerUtil.newArrayList(); @@ -119,7 +120,7 @@ public class ImportMavenRepositoriesTask implements Runnable { } }.execute().getResultObject(); - if (mavenRemoteRepositories.isEmpty()) return; + if (mavenRemoteRepositories == null || mavenRemoteRepositories.isEmpty()) return; MavenRepositoriesHolder.getInstance(myProject).update(mavenRemoteRepositories);