From eb78c0fb6c16468b4de24a163858dee748733b52 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 14 Aug 2014 19:53:30 +0400
Subject: [PATCH] simplify, reduce volatile write count

---
 .../intellij/openapi/progress/ProgressIndicatorProvider.java   | 2 +-
 .../intellij/openapi/progress/impl/ProgressManagerImpl.java    | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/platform/core-api/src/com/intellij/openapi/progress/ProgressIndicatorProvider.java b/platform/core-api/src/com/intellij/openapi/progress/ProgressIndicatorProvider.java
index c2a40b46f348..afe440b8588f 100644
--- a/platform/core-api/src/com/intellij/openapi/progress/ProgressIndicatorProvider.java
+++ b/platform/core-api/src/com/intellij/openapi/progress/ProgressIndicatorProvider.java
@@ -46,7 +46,7 @@ public abstract class ProgressIndicatorProvider {
     return ourInstance != null ? ourInstance.startNonCancelableSection() : NonCancelableSection.EMPTY;
   }
 
-  public static volatile boolean ourNeedToCheckCancel = false;
+  protected static volatile boolean ourNeedToCheckCancel = false;
   public static void checkCanceled() throws ProcessCanceledException {
     // smart optimization! There's a thread started in ProgressManagerImpl, that set's this flag up once in 10 milliseconds
     if (ourNeedToCheckCancel && ourInstance != null) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/progress/impl/ProgressManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/progress/impl/ProgressManagerImpl.java
index b1b21d4468e8..6a37bb2fb69e 100644
--- a/platform/platform-impl/src/com/intellij/openapi/progress/impl/ProgressManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/progress/impl/ProgressManagerImpl.java
@@ -63,7 +63,6 @@ public class ProgressManagerImpl extends ProgressManager implements Disposable {
         @Override
         public void run() {
           ourNeedToCheckCancel = true;
-          ProgressIndicatorProvider.ourNeedToCheckCancel = true;
         }
       }, 0, 10, TimeUnit.MILLISECONDS);
     }
@@ -85,7 +84,6 @@ public class ProgressManagerImpl extends ProgressManager implements Disposable {
           if (ourLockedCheckCounter > 10) {
             ourLockedCheckCounter = 0;
             ourNeedToCheckCancel = true;
-            ProgressIndicatorProvider.ourNeedToCheckCancel = true;
           }
         }
         else {
@@ -98,7 +96,6 @@ public class ProgressManagerImpl extends ProgressManager implements Disposable {
 
   public static void canceled() {
     ourNeedToCheckCancel = true;
-    ProgressIndicatorProvider.ourNeedToCheckCancel = true;
   }
 
   private static class NonCancelableIndicator extends EmptyProgressIndicator implements NonCancelableSection {