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 possible NPE

Browse Source
This commit is contained in:
Aleksey Pivovarov
2016-02-26 14:07:21 +03:00
parent 96c3fec4bb
commit ed5656c847
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateVcsVirtualFileAction.java
+3 -1
View File
@@ -30,6 +30,7 @@ import com.intellij.openapi.vcs.*;
import com.intellij.openapi.vcs.annotate.AnnotationProvider;
import com.intellij.openapi.vcs.annotate.FileAnnotation;
import com.intellij.openapi.vcs.changes.ContentRevision;
import com.intellij.openapi.vcs.history.VcsFileRevision;
import com.intellij.openapi.vcs.history.VcsRevisionNumber;
import com.intellij.openapi.vcs.vfs.ContentRevisionVirtualFile;
import com.intellij.openapi.vcs.vfs.VcsVirtualFile;
@@ -156,7 +157,8 @@ public class AnnotateVcsVirtualFileAction {
VcsRevisionNumber revisionNumber = null;
if (file instanceof VcsVirtualFile) {
filePath = VcsUtil.getFilePath(file.getPath());
revisionNumber = ((VcsVirtualFile)file).getFileRevision().getRevisionNumber();
VcsFileRevision revision = ((VcsVirtualFile)file).getFileRevision();
revisionNumber = revision != null ? revision.getRevisionNumber() : null;
}
else if (file instanceof ContentRevisionVirtualFile) {
ContentRevision revision = ((ContentRevisionVirtualFile)file).getContentRevision();