Fix #265. Don't invoke getTypeParameters and getComponentType on each…

… call of setGenerics(). Pre-compute and cache them instead whenever it is possible.
EsotericSoftware · Nov 18, 2014 · 143c097 · 143c097
1 parent 000d88d
commit 143c097
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/com/esotericsoftware/kryo/serializers/FieldSerializer.java b/src/com/esotericsoftware/kryo/serializers/FieldSerializer.java
@@ -51,7 +51,8 @@ public class FieldSerializer<T> extends Serializer<T> implements Comparator<Fiel
 	final Kryo kryo;
 	final Class type;
 	/** type variables declared for this type */
-	final private TypeVariable[] typeParameters;
+	final TypeVariable[] typeParameters;
+	final Class componentType;
 	private CachedField[] fields = new CachedField[0];
 	private CachedField[] transientFields = new CachedField[0];
 	protected HashSet<CachedField> removedFields = new HashSet();
@@ -122,6 +123,10 @@ public FieldSerializer (Kryo kryo, Class type) {
 		this.kryo = kryo;
 		this.type = type;
 		this.typeParameters = type.getTypeParameters();
+		if (this.typeParameters == null || this.typeParameters.length == 0)
+			this.componentType = type.getComponentType();
+		else
+			this.componentType = null;
 		this.useAsmEnabled = kryo.getAsmEnabled();
 		if (!this.useAsmEnabled && !unsafeAvailable) {
 			this.useAsmEnabled = true;
@@ -138,6 +143,10 @@ public FieldSerializer (Kryo kryo, Class type, Class[] generics) {
 		this.type = type;
 		this.generics = generics;
 		this.typeParameters = type.getTypeParameters();
+		if (this.typeParameters == null || this.typeParameters.length == 0)
+			this.componentType = type.getComponentType();
+		else
+			this.componentType = null;
 		this.useAsmEnabled = kryo.getAsmEnabled();
 		if (!this.useAsmEnabled && !unsafeAvailable) {
 			this.useAsmEnabled = true;

diff --git a/src/com/esotericsoftware/kryo/serializers/FieldSerializerGenericsUtil.java b/src/com/esotericsoftware/kryo/serializers/FieldSerializerGenericsUtil.java
@@ -43,9 +43,15 @@ Generics buildGenericsScope (Class clazz, Class[] generics) {
 		TypeVariable[] typeParams = null;
 
 		while (typ != null) {
-			typeParams = typ.getTypeParameters();
+			if (typ == this.serializer.type)
+				typeParams = this.serializer.typeParameters;
+			else
+				typeParams = typ.getTypeParameters();
 			if (typeParams == null || typeParams.length == 0) {
-				typ = typ.getComponentType();
+				if (typ == this.serializer.type)
+					typ = this.serializer.componentType;
+				else
+					typ = typ.getComponentType();
 			} else
 				break;
 		}