From 77a93e18427bf4e8a7ecc37a9a780084534b618f Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Tue, 14 Mar 2017 10:43:53 +0300
Subject: [PATCH] IDEA-169463 Creating a Gradle project sends mismatched
 onStart() and onEnd() notifications to
 ExternalSystemTaskNotificationListenerAdapter

---
 .../plugins/gradle/service/execution/GradleExecutionHelper.java  | 1 -
 .../plugins/gradle/service/project/GradleProjectResolver.java    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleExecutionHelper.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleExecutionHelper.java
index 0aa69cfd4e45..fe1f7aceddd0 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleExecutionHelper.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleExecutionHelper.java
@@ -146,7 +146,6 @@ public class GradleExecutionHelper {
       operation.withArguments(ArrayUtil.toStringArray(filteredArgs));
     }
 
-    listener.onStart(id);
     final String javaHome = settings.getJavaHome();
     if (javaHome != null && new File(javaHome).isDirectory()) {
       operation.setJavaHome(new File(javaHome));
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
index d3dcfd55a95f..3f0c81a7bd90 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
@@ -253,6 +253,7 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver<Grad
           myCancellationMap.putValue(resolverCtx.getExternalSystemTaskId(), new UnsupportedCancellationToken());
         }
       }
+      resolverCtx.getListener().onStart(resolverCtx.getExternalSystemTaskId());
       allModels = buildActionExecutor.run();
       if (allModels == null) {
         throw new IllegalStateException("Unable to get project model for the project: " + resolverCtx.getProjectPath());