From 1c2cc91f35018e2e3eace4e684a48cfdb82c88a9 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 15 Sep 2017 18:39:19 +0200
Subject: [PATCH] IDEA-179077 NPE at
 org.jetbrains.idea.perforce.application.PerforceInfoAndClient.calcInfoMap

---
 .../src/com/intellij/lifecycle/PeriodicalTasksCloser.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/platform/vcs-api/vcs-api-core/src/com/intellij/lifecycle/PeriodicalTasksCloser.java b/platform/vcs-api/vcs-api-core/src/com/intellij/lifecycle/PeriodicalTasksCloser.java
index b849b3cde985..c2c2823105fc 100644
--- a/platform/vcs-api/vcs-api-core/src/com/intellij/lifecycle/PeriodicalTasksCloser.java
+++ b/platform/vcs-api/vcs-api-core/src/com/intellij/lifecycle/PeriodicalTasksCloser.java
@@ -19,6 +19,7 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProcessCanceledException;
+import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.ExceptionUtil;
 import org.jetbrains.annotations.NotNull;
@@ -51,8 +52,11 @@ public class PeriodicalTasksCloser {
   public <T> T safeGetService(@NotNull final Project project, final Class<T> componentClass) throws ProcessCanceledException {
     try {
       T service = ServiceManager.getService(project, componentClass);
-      if (service == null && project.isDefault()) {
-        LOG.info("no service in default project: " + componentClass.getName());
+      if (service == null) {
+        ProgressManager.checkCanceled();
+        if (project.isDefault()) {
+          LOG.info("no service in default project: " + componentClass.getName());
+        }
       }
       return service;
     }