From 0b8b7aa9bfdc189728a98a55a749c7579b5164a4 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Fri, 21 Jun 2013 14:26:24 +0400
Subject: [PATCH] [git] Fix possible race condition in tests

The flags are accessed from different threads => volatile
---
 .../testFramework/com/intellij/dvcs/test/MockVcsHelper.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/dvcs/testFramework/com/intellij/dvcs/test/MockVcsHelper.java b/platform/dvcs/testFramework/com/intellij/dvcs/test/MockVcsHelper.java
index 25b2b12f4fc3..98884e6e2b24 100644
--- a/platform/dvcs/testFramework/com/intellij/dvcs/test/MockVcsHelper.java
+++ b/platform/dvcs/testFramework/com/intellij/dvcs/test/MockVcsHelper.java
@@ -45,8 +45,8 @@ import java.util.Map;
  * @author Kirill Likhodedov
  */
 public class MockVcsHelper extends AbstractVcsHelper {
-  private boolean myCommitDialogShown;
-  private boolean myMergeDialogShown;
+  private volatile boolean myCommitDialogShown;
+  private volatile boolean myMergeDialogShown;
 
   private CommitHandler myCommitHandler;
   private MergeHandler myMergeHandler;