From a69a1645d5b51ed23f066ef60aa58a7e49ecc999 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Mon, 8 Dec 2014 12:51:37 +0300 Subject: [PATCH] EA-63098 - check if VirtualFile isValid --- .../com/intellij/openapi/vcs/impl/VcsFileStatusProvider.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsFileStatusProvider.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsFileStatusProvider.java index e75d0d5aab53..2f128221327a 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsFileStatusProvider.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsFileStatusProvider.java @@ -177,9 +177,11 @@ public class VcsFileStatusProvider implements FileStatusProvider, VcsBaseContent String content = ApplicationManager.getApplication().runReadAction(new Computable() { @Override public String compute() { + if (!file.isValid()) return null; return LoadTextUtil.loadText(file).toString(); } }); + if (content == null) return null; return Pair.create(VcsRevisionNumber.NULL, content); }