commit a0fc8d57f906f24ee09979cb0a617f0ce240c8eb
author Jeff Arneson <jarneson@google.com> Wed Mar 11 17:32:09 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 11 17:32:09 2015 +0000
tree cebb414a699ae1c4cad7cf08cc2f72b0e55e6f40
parent acc01a24ed0e135418e2d8f51e117f14256e2e10
parent 2c119d8e27ceac1471de4ba751a73e2e3bf1a30c

am 2c119d8e: am 8714f8c8: am 74512bea: Fix a NPE in the type parameter checking in stubs

* commit '2c119d8e27ceac1471de4ba751a73e2e3bf1a30c':
  Fix a NPE in the type parameter checking in stubs

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