From 3c8fe33ba3228ebb7ed5568b21697ee643e84cac Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Thu, 19 May 2011 18:18:17 +0400
Subject: [PATCH] WI-6368 Exception with SVN annotations

---
 .../org/jetbrains/idea/svn/annotate/SvnAnnotationProvider.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/annotate/SvnAnnotationProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/annotate/SvnAnnotationProvider.java
index b4d18c4b111b..2e3934c149ab 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/annotate/SvnAnnotationProvider.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/annotate/SvnAnnotationProvider.java
@@ -204,6 +204,7 @@ public class SvnAnnotationProvider implements AnnotationProvider, VcsCacheableAn
     for (int i = 0; i < size; i++) {
       if (svnFileAnnotation.getAnnotationSourceSwitcher().mergeSourceAvailable(i)) {
         final VcsRevisionNumber number = svnFileAnnotation.getLineRevisionNumber(i);
+        if (number == null) continue;
         merged.put(i, number);
         addMap.put(number, svnFileAnnotation.getRevision(((SvnRevisionNumber) number).getRevision().getNumber()));
       }