commit 74512bea742c1b962d64671fea7720ba38748655
author Jeff Arneson <jarneson@google.com> Tue Mar 10 14:09:08 2015 -0700
committer Jeff Arneson <jarneson@google.com> Tue Mar 10 21:10:27 2015 +0000
tree 740a9ce4cb7c8aefe26695f8d3128fa8d8ffd5c4
parent 47ed86e3f668b7d12bfca0db7ce4c11c3d691fc6

Fix a NPE in the type parameter checking in stubs

Bug: 19679810
Change-Id: I230b85b1366a894977f0b390f667718103e72679

src/com/google/doclava/Stubs.java

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 @@
                 + 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 @@
           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()