From 8162e5a2866e19ccc057c144f83c673d421a082a Mon Sep 17 00:00:00 2001
From: Dmitry Batrak <Dmitry.Batrak@jetbrains.com>
Date: Mon, 24 Mar 2014 16:44:53 +0400
Subject: [PATCH] EA-54991 - ISE: CaretModelImpl.getCurrentCaret

---
 .../src/com/intellij/openapi/editor/impl/CaretModelImpl.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
index aa548af56b05..106a3e728a89 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
@@ -229,7 +229,8 @@ public class CaretModelImpl implements CaretModel, PrioritizedDocumentListener,
   @Override
   @NotNull
   public CaretImpl getCurrentCaret() {
-    return ApplicationManager.getApplication().isDispatchThread() && myCurrentCaret != null ? myCurrentCaret : getPrimaryCaret();
+    CaretImpl currentCaret = myCurrentCaret;
+    return ApplicationManager.getApplication().isDispatchThread() && currentCaret != null ? currentCaret : getPrimaryCaret();
   }
 
   @Override