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

EA-66225 diff: fix NPE

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-03-12 12:41:25 +03:00
parent 33cfd8fdd2
commit 6eda4582dd
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ChangeForDiffConvertor.java
+1 -2
View File
@@ -57,8 +57,7 @@ public class ChangeForDiffConvertor implements Convertor<Change, DiffRequestPres
}
if (ChangesUtil.isTextConflictingChange(ch)) {
final AbstractVcs vcs = ChangesUtil.getVcsForChange(ch, myProject);
final MergeProvider mergeProvider = vcs.getMergeProvider();
if (mergeProvider == null) return null;
if (vcs == null || vcs.getMergeProvider() == null) return null;
final FilePath path = ChangesUtil.getFilePath(ch);
VirtualFile vf = path.getVirtualFile();
if (vf == null) {