From 47979c3bcbec5b66bd7c53be218b95181760d98f Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Mon, 30 Sep 2013 13:55:56 +0400 Subject: [PATCH] Gradle: NPE fixed --- .../resolve/GradleImplicitContributor.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/resolve/GradleImplicitContributor.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/resolve/GradleImplicitContributor.java index fc7e1e38737f..2936d684c361 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/resolve/GradleImplicitContributor.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/resolve/GradleImplicitContributor.java @@ -151,15 +151,16 @@ public class GradleImplicitContributor implements GradleMethodContextContributor } Module module = ModuleUtilCore.findModuleForPsiElement(place); - if (module != null) { - String path = module.getOptionValue(ExternalSystemConstants.ROOT_PROJECT_PATH_KEY); - GradleLocalSettings localSettings = GradleLocalSettings.getInstance(place.getProject()); - Collection taskPojos = localSettings.getAvailableTasks().get(path); - for (ExternalTaskPojo taskPojo : taskPojos) { - if (taskName.equals(taskPojo.getName())) { - processTask(taskName, GRADLE_API_TASK, psiManager, processor, state, place); - return; - } + if (module == null) return; + String path = module.getOptionValue(ExternalSystemConstants.ROOT_PROJECT_PATH_KEY); + GradleLocalSettings localSettings = GradleLocalSettings.getInstance(place.getProject()); + Collection taskPojos = localSettings.getAvailableTasks().get(path); + if (taskPojos == null) return; + + for (ExternalTaskPojo taskPojo : taskPojos) { + if (taskName.equals(taskPojo.getName())) { + processTask(taskName, GRADLE_API_TASK, psiManager, processor, state, place); + return; } } }