diff options
| author | Brett Chabot <brettchabot@google.com> | 2014-09-10 15:02:18 -0700 |
|---|---|---|
| committer | Justin Morey <jmorey@google.com> | 2014-11-13 00:05:04 +0000 |
| commit | a2769edc45485149708af8eaa08156623ba72313 (patch) | |
| tree | a26831225174a387a2905bc7bcdd8eabe924a417 /src | |
| parent | f8a3be52b9a4eb3086db5cbe236e99f0a5a05f5d (diff) | |
| download | android_external_doclava-a2769edc45485149708af8eaa08156623ba72313.tar.gz android_external_doclava-a2769edc45485149708af8eaa08156623ba72313.tar.bz2 android_external_doclava-a2769edc45485149708af8eaa08156623ba72313.zip | |
Prevent NPE when converting api to xml.
If a stub ClassInfo is generated, calling 'showAnnotations' on it
would throw a NPE.
Bug: 14063625
Change-Id: Ic3af51ab7e488c599b87449b30b46e2ecfe03112
(cherry picked from commit baf6bc51adf56a5ed569f9ab1edb31980324fee6)
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/google/doclava/ClassInfo.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 class ClassInfo extends DocInfo implements ContainerInfo, Comparable, Sco } public boolean hasShowAnnotation() { - return mShowAnnotations.size() > 0; + return mShowAnnotations != null && mShowAnnotations.size() > 0; } public ArrayList<AnnotationInstanceInfo> showAnnotations() { |