commit bc2fc7298ebb5e00d45145694594452524151cb1
author Ying Wang <wangying@google.com> Thu Oct 30 18:59:21 2014 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 30 18:59:21 2014 +0000
tree a26831225174a387a2905bc7bcdd8eabe924a417
parent c85d04e1bb64e109f6a3525ab02254dbf606735d
parent b456f6d2d68619a03ceec07284d34cc889bc4042

Add generics to the field types in the API file. automerge: 1e62346
automerge: b456f6d

* commit 'b456f6d2d68619a03ceec07284d34cc889bc4042':
  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() {