From 01b3221ffc7dd55f5ed1fbbc5d807335d0723912 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 21 Apr 2017 20:34:17 +0200
Subject: [PATCH] obey benign race rules in ProgressManager.checkCanceled
 (IDEA-CR-20502)

---
 .../src/com/intellij/openapi/progress/ProgressManager.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java b/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java
index 7ab4d9b5273b..e0fd454d689f 100644
--- a/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java
+++ b/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java
@@ -201,8 +201,9 @@ public abstract class ProgressManager extends ProgressIndicatorProvider {
 
   @SuppressWarnings("MethodOverridesStaticMethodOfSuperclass")
   public static void checkCanceled() throws ProcessCanceledException {
-    if (ourInstance != null) {
-      ourInstance.doCheckCanceled();
+    ProgressManager instance = ourInstance;
+    if (instance != null) {
+      instance.doCheckCanceled();
     }
   }