adjusted factory finding code to take into account non-present factories

ccdebug · Nov 10, 2014 · f2591b6 · f2591b6
1 parent 7f8f490
commit f2591b6
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/gson/src/main/java/com/google/gson/Gson.java b/gson/src/main/java/com/google/gson/Gson.java
@@ -420,6 +420,10 @@ public <T> TypeAdapter<T> getAdapter(TypeToken<T> type) {
    */
   public <T> TypeAdapter<T> getDelegateAdapter(TypeAdapterFactory skipPast, TypeToken<T> type) {
     boolean skipPastFound = false;
+    // Skip past if and only if the specified factory is present in the factories.
+    // This is useful because the factories created through JsonAdapter annotations are not
+    // registered in this list.
+    if (!factories.contains(skipPast)) skipPastFound = true;
 
     for (TypeAdapterFactory factory : factories) {
       if (!skipPastFound) {