commit c85d04e1bb64e109f6a3525ab02254dbf606735d
author Ying Wang <wangying@google.com> Tue Oct 28 03:36:29 2014 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 28 03:36:29 2014 +0000
tree a26831225174a387a2905bc7bcdd8eabe924a417
parent 27a8051544ff6090d153ad6ae9abf2296421b4e7
parent 7751817561b5fea6ffaee8cad497ab6876deca0e

Add generics to the field types in the API file.
automerge: 7751817

* commit '7751817561b5fea6ffaee8cad497ab6876deca0e':
  Add generics to the field types in the API file.

src/com/google/doclava/ClassInfo.java

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