commit 3e45da65c7b31f6b66368028940b01ed4b3955b7
author Jeff Arneson <jarneson@google.com> Mon Feb 02 20:59:25 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 02 20:59:25 2015 +0000
tree d0d23d46fcf45965d1da5944ba2b7fe6b25bc52a
parent a9bb5130c4e69cd90887decc1c22dfed522c5c97
parent 5624eba1aeb5c28b4d13f324f0eb6eccd6afd1cd

am 5624eba1: am d71cda54: am a1c4e3c3: Fix a syntax error in the link rendering macro

* commit '5624eba1aeb5c28b4d13f324f0eb6eccd6afd1cd':
  Fix a syntax error in the link rendering macro

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() {