More appropriate usage of null key surrogate in Gson#getAdapter for b…

…ackward compatibility
google · Mar 4, 2016 · 31dcfa3 · 31dcfa3
1 parent c561184
commit 31dcfa3
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/gson/src/main/java/com/google/gson/Gson.java b/gson/src/main/java/com/google/gson/Gson.java
@@ -390,10 +390,7 @@ private static TypeAdapter<AtomicLongArray> atomicLongArrayAdapter(final TypeAda
    */
   @SuppressWarnings("unchecked")
   public <T> TypeAdapter<T> getAdapter(TypeToken<T> type) {
-    if (type == null) {
-      type = (TypeToken<T>) NULL_KEY_SURROGATE;
-    }
-    TypeAdapter<?> cached = typeTokenCache.get(type);
+    TypeAdapter<?> cached = typeTokenCache.get(type == null ? NULL_KEY_SURROGATE : type);
     if (cached != null) {
       return (TypeAdapter<T>) cached;
     }