MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

vcs: fix NPE in "Local History"

Browse Source 
follow-up: 61111cf320
This commit is contained in:
Aleksey Pivovarov
2018-06-28 21:48:25 +03:00
parent 7bb0674fe2
commit 8a18d8d712
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lvcs-impl/src/com/intellij/history/core/revisions/Difference.java
+6 -5
View File
@@ -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() {