From 6f0c00d35359f2a233eb566ae6de894fa16be685 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Tue, 4 Jul 2017 16:57:28 +0300 Subject: [PATCH] EA-104225 - CCE: GitAnnotationProvider.annotate --- .../openapi/vcs/actions/AnnotateDiffViewerAction.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateDiffViewerAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateDiffViewerAction.java index e7b9be09209e..dcf8d07db52d 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateDiffViewerAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateDiffViewerAction.java @@ -284,7 +284,10 @@ public class AnnotateDiffViewerAction { @Nullable final FilePath path, @Nullable final VcsRevisionNumber revisionNumber) { if (vcs == null || path == null || revisionNumber == null) return null; - if (revisionNumber instanceof TextRevisionNumber) return null; + if (revisionNumber instanceof TextRevisionNumber || + revisionNumber == VcsRevisionNumber.NULL) { + return null; + } final AnnotationProvider annotationProvider = vcs.getAnnotationProvider(); if (!(annotationProvider instanceof AnnotationProviderEx)) return null;