commit f2aaefa64d6f026c68872cd4eb41432492a64114
author Jeff Arneson <jarneson@google.com> Tue Dec 02 21:11:42 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 02 21:11:42 2014 +0000
tree b40b5581c7c42c79ef2f2359b457eb1601e34d89
parent a2769edc45485149708af8eaa08156623ba72313
parent d6570b0b7f66519ba50c18d9e08db423bdf1341e

am d6570b0b: Fix docs for classes that implement or extend generics with type parameters

* commit 'd6570b0b7f66519ba50c18d9e08db423bdf1341e':
  Fix docs for classes that implement or extend generics with type parameters

src/com/google/doclava/ClassInfo.java

diff --git a/src/com/google/doclava/ClassInfo.java b/src/com/google/doclava/ClassInfo.java
index f5309bb..14cd99c 100644
--- a/src/com/google/doclava/ClassInfo.java
+++ b/src/com/google/doclava/ClassInfo.java
@@ -1586,7 +1586,7 @@
   }
 
   public boolean hasShowAnnotation() {
-    return mShowAnnotations.size() > 0;
+    return mShowAnnotations != null && mShowAnnotations.size() > 0;
   }
 
   public ArrayList<AnnotationInstanceInfo> showAnnotations() {