commit 62d776ec2e4531ef97cbe891fc36cc900e7c7ef5
author Xin Li <delphij@google.com> Mon Nov 13 14:35:23 2017 -0800
committer Xin Li <delphij@google.com> Mon Nov 13 14:35:23 2017 -0800
tree fff046cbbbcd28fcaf74cbe9a78ce794bb04c4b4
parent 221404f748027996efdcc2c365313f6c3e5a014a
parent 8fd9d692aabab8f55f90ab1aa2885c8502534275

Merge commit '8fd9d692aabab8f55f90ab1aa2885c8502534275' into HEAD

Change-Id: I192640a4782329de7ba17082a93ce75aef56a8c4

src/com/google/doclava/Converter.java

diff --git a/src/com/google/doclava/Converter.java b/src/com/google/doclava/Converter.java
index 0d4e455..71c7acb 100644
--- a/src/com/google/doclava/Converter.java
+++ b/src/com/google/doclava/Converter.java
@@ -614,7 +614,10 @@
     @Override
     protected Object keyFor(Object o) {
       Type t = (Type) o;
-      String keyString = o.getClass().getName() + "/" + o.toString() + "/";
+      while (t.asAnnotatedType() != null) {
+        t = t.asAnnotatedType().underlyingType();
+      }
+      String keyString = t.getClass().getName() + "/" + t.toString() + "/";
       if (t.asParameterizedType() != null) {
         keyString += t.asParameterizedType().toString() + "/";
         if (t.asParameterizedType().typeArguments() != null) {