fix ParameterizedTypeImpl memory leak case, fix #3329

alibaba · Jul 19, 2020 · 38070ca · 38070ca
1 parent 545a06b
commit 38070ca
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 0 deletions.
diff --git a/src/main/java/com/alibaba/fastjson/TypeReference.java b/src/main/java/com/alibaba/fastjson/TypeReference.java
@@ -92,7 +92,16 @@ protected TypeReference(Type... actualTypeArguments){
         }
 
         type = cachedType;
+    }
+
+    public static Type intern(ParameterizedTypeImpl type) {
+        Type cachedType = classTypeCache.get(type);
+        if (cachedType == null) {
+            classTypeCache.putIfAbsent(type, type);
+            cachedType = classTypeCache.get(type);
+        }
 
+        return cachedType;
     }
 
     private Type handlerParameterizedType(ParameterizedType type, Type[] actualTypeArguments, int actualIndex) {

diff --git a/src/main/java/com/alibaba/fastjson/parser/ParserConfig.java b/src/main/java/com/alibaba/fastjson/parser/ParserConfig.java
@@ -216,6 +216,7 @@ public static ParserConfig getGlobalInstance() {
                 0xA123A62F93178B20L,
                 0xA85882CE1044C450L,
                 0xAA3DAFFDB10C4937L,
+                0xAAAA0826487A3737L,
                 0xAC6262F52C98AA39L,
                 0xAD937A449831E8A0L,
                 0xAE50DA1FAD60A096L,
@@ -615,6 +616,11 @@ public ObjectDeserializer getDeserializer(Type type) {
 
     public ObjectDeserializer getDeserializer(Class<?> clazz, Type type) {
         ObjectDeserializer deserializer = get(type);
+        if (deserializer == null && type instanceof ParameterizedTypeImpl) {
+            Type innerType = TypeReference.intern((ParameterizedTypeImpl) type);
+            deserializer = get(innerType);
+        }
+
         if (deserializer != null) {
             return deserializer;
         }

diff --git a/src/main/java/com/alibaba/fastjson/util/IdentityHashMap.java b/src/main/java/com/alibaba/fastjson/util/IdentityHashMap.java
@@ -109,4 +109,15 @@ public Entry(K key, V value, int hash, Entry<K, V> next){
     public void clear() {
         Arrays.fill(this.buckets, null);
     }
+
+    public int size() {
+        int count = 0;
+        for (Entry<K, V> bucket : this.buckets) {
+            for (; bucket != null; bucket = bucket.next) {
+                count++;
+            }
+        }
+
+        return count;
+    }
 }
diff --git a/src/test/java/com/alibaba/json/bvt/issue_3300/Issue3329.java b/src/test/java/com/alibaba/json/bvt/issue_3300/Issue3329.java
@@ -0,0 +1,38 @@
+package com.alibaba.json.bvt.issue_3300;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.parser.ParserConfig;
+import com.alibaba.fastjson.parser.deserializer.ObjectDeserializer;
+import com.alibaba.fastjson.util.IdentityHashMap;
+import com.alibaba.fastjson.util.ParameterizedTypeImpl;
+import junit.framework.TestCase;
+import java.util.List;
+
+import java.lang.reflect.Type;
+
+public class Issue3329 extends TestCase {
+    public void test_for_issue() throws Exception {
+        ParserConfig config = new ParserConfig();
+        IdentityHashMap<Type, ObjectDeserializer> deserializers = config.getDeserializers();
+        int initSize = deserializers.size();
+        for (int i = 0; i < 1000 * 10; ++i) {
+            assertEquals(123,
+                ((VO<User>) JSON.parseObject("{\"value\":{\"id\":123}}",
+                        new ParameterizedTypeImpl(new Type[] {User.class}, null, VO.class),
+                        config
+                        )).value.id
+            );
+        }
+
+
+        assertEquals(2, deserializers.size() - initSize);
+    }
+
+    public static class VO<T> {
+        public T value;
+    }
+
+    public static class User {
+        public int id;
+    }
+}