commit b8cc40eb3276b650d2730cf4566adfeebb56f1f4
author Tobias Thierer <tobiast@google.com> Mon Nov 13 14:03:02 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 13 14:03:02 2017 +0000
tree fff046cbbbcd28fcaf74cbe9a78ce794bb04c4b4
parent b22f1f1fd798327e21de1cd27510d5d0f1ae35a1
parent 221404f748027996efdcc2c365313f6c3e5a014a

Merge "Handle type annotations when generating cache keys" am: 255b001fc2
am: 221404f748

Change-Id: I6cda5bf0fe35ca432d78187dcb8e4d66bfa69bb6

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) {