From 0d78517856cf563eb925d3316e97429d8f2216e8 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 13 Mar 2017 08:47:55 +0100
Subject: [PATCH] fix vcs test blinks

acknowledge that the Changes View refresh future might be canceled
+ cleanup
---
 .../intellij/openapi/vcs/changes/ChangeListManagerImpl.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
index d6a04a61c895..794d29325e8b 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
@@ -160,6 +160,7 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec
       ProjectManager.getInstance().addProjectManagerListener(project, new ProjectManagerListener() {
         @Override
         public void projectClosing(Project project) {
+          //noinspection TestOnlyProblems
           waitEverythingDoneInTestMode();
         }
       });
@@ -1562,6 +1563,7 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec
     Future future = ourUpdateAlarm.get();
     if (future != null) {
       future.cancel(true);
+      ourUpdateAlarm.compareAndSet(future, null);
     }
   }
 
@@ -1582,7 +1584,7 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec
       catch (InterruptedException | ExecutionException e) {
         LOG.error(e);
       }
-      catch (TimeoutException ignore) {
+      catch (TimeoutException | CancellationException ignore) {
       }
     }
   }