diff options
| author | Jeff Arneson <jarneson@google.com> | 2015-03-11 17:18:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-11 17:18:45 +0000 |
| commit | 2c119d8e27ceac1471de4ba751a73e2e3bf1a30c (patch) | |
| tree | 740a9ce4cb7c8aefe26695f8d3128fa8d8ffd5c4 | |
| parent | 3f88ebb2e964b4367a0abe85c06c84055ec11687 (diff) | |
| parent | 8714f8c82c3451d16fce4f321c9f772628644312 (diff) | |
| download | android_external_doclava-2c119d8e27ceac1471de4ba751a73e2e3bf1a30c.tar.gz android_external_doclava-2c119d8e27ceac1471de4ba751a73e2e3bf1a30c.tar.bz2 android_external_doclava-2c119d8e27ceac1471de4ba751a73e2e3bf1a30c.zip | |
am 8714f8c8: am 74512bea: Fix a NPE in the type parameter checking in stubs
* commit '8714f8c82c3451d16fce4f321c9f772628644312':
Fix a NPE in the type parameter checking in stubs
| -rw-r--r-- | src/com/google/doclava/Stubs.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/com/google/doclava/Stubs.java b/src/com/google/doclava/Stubs.java index f387801..bc5e586 100644 --- a/src/com/google/doclava/Stubs.java +++ b/src/com/google/doclava/Stubs.java @@ -94,16 +94,16 @@ public class Stubs { + m.name() + " is deprecated"); } - ClassInfo hiddenReturnClass = findHiddenClasses(m.returnType()); - if (null != hiddenReturnClass) { - if (hiddenReturnClass.qualifiedName() == m.returnType().asClassInfo().qualifiedName()) { + ClassInfo hiddenClass = findHiddenClasses(m.returnType()); + if (null != hiddenClass) { + if (hiddenClass.qualifiedName() == m.returnType().asClassInfo().qualifiedName()) { // Return type is hidden Errors.error(Errors.UNAVAILABLE_SYMBOL, m.position(), "Method " + cl.qualifiedName() - + "." + m.name() + " returns unavailable type " + hiddenReturnClass.name()); + + "." + m.name() + " returns unavailable type " + hiddenClass.name()); } else { // Return type contains a generic parameter Errors.error(Errors.HIDDEN_TYPE_PARAMETER, m.position(), "Method " + cl.qualifiedName() - + "." + m.name() + " returns unavailable type " + hiddenReturnClass.name() + + "." + m.name() + " returns unavailable type " + hiddenClass.name() + " as a type parameter"); } } @@ -111,8 +111,9 @@ public class Stubs { for (ParameterInfo p : m.parameters()) { TypeInfo t = p.type(); if (!t.isPrimitive()) { - if (null != findHiddenClasses(t)) { - if (hiddenReturnClass.qualifiedName() == t.asClassInfo().qualifiedName()) { + hiddenClass = findHiddenClasses(t); + if (null != hiddenClass) { + if (hiddenClass.qualifiedName() == t.asClassInfo().qualifiedName()) { // Parameter type is hidden Errors.error(Errors.UNAVAILABLE_SYMBOL, m.position(), "Parameter of unavailable type " + t.fullName() + " in " + cl.qualifiedName() |