From 8a18d8d712847c314e38ee5738a6e0246aff23cc Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Thu, 28 Jun 2018 21:42:42 +0300 Subject: [PATCH] vcs: fix NPE in "Local History" follow-up: 61111cf32000afd99e27acb653e9d9eefb563087 --- .../intellij/history/core/revisions/Difference.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/platform/lvcs-impl/src/com/intellij/history/core/revisions/Difference.java b/platform/lvcs-impl/src/com/intellij/history/core/revisions/Difference.java index 9dd82d50b48a..1c049a2d2b4e 100644 --- a/platform/lvcs-impl/src/com/intellij/history/core/revisions/Difference.java +++ b/platform/lvcs-impl/src/com/intellij/history/core/revisions/Difference.java @@ -41,7 +41,7 @@ public class Difference { this(isFile, left, right, false); } - public Difference(boolean isFile, Entry left, Entry right, boolean isRightContentCurrent) { + public Difference(boolean isFile, @Nullable Entry left, @Nullable Entry right, boolean isRightContentCurrent) { myIsFile = isFile; myLeft = left; myRight = right; @@ -65,14 +65,15 @@ public class Difference { } public ContentRevision getRightContentRevision(IdeaGateway gw) { - if (myRightContentCurrent) { - VirtualFile file = gw.findVirtualFile(getRight().getPath()); + Entry entry = getRight(); + if (myRightContentCurrent && entry != null) { + VirtualFile file = gw.findVirtualFile(entry.getPath()); if (file != null) return new CurrentContentRevision(VcsUtil.getFilePath(file)); } - return createContentRevision(getRight(), gw); + return createContentRevision(entry, gw); } - private static ContentRevision createContentRevision(final Entry e, final IdeaGateway gw) { + private static ContentRevision createContentRevision(@Nullable Entry e, final IdeaGateway gw) { if (e == null) return null; return new ByteBackedContentRevision() {