From 16dad15fb26ee6dd9f5300f2138c22cb767d5351 Mon Sep 17 00:00:00 2001 From: Aljoscha Krettek Date: Tue, 2 Sep 2014 18:40:17 +0200 Subject: [PATCH] Change ObjectArrayTypeInfo.getInfoFor to use componentInfo.isTupleType() This is necessary because the previous test didn't work for Scala tuples. --- .../apache/flink/api/java/typeutils/ObjectArrayTypeInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flink-java/src/main/java/org/apache/flink/api/java/typeutils/ObjectArrayTypeInfo.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/ObjectArrayTypeInfo.java index b7569ac4416..08022805fd0 100644 --- a/flink-java/src/main/java/org/apache/flink/api/java/typeutils/ObjectArrayTypeInfo.java +++ b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/ObjectArrayTypeInfo.java @@ -116,7 +116,7 @@ public class ObjectArrayTypeInfo extends TypeInformation { return new ObjectArrayTypeInfo(type, genericArray.getGenericComponentType(), componentInfo); } // for tuples without generics (e.g. generated by the TypeInformation parser) - else if (type instanceof Class && ((Class) type).isArray() && Tuple.class.isAssignableFrom(((Class) type).getComponentType()) + else if (type instanceof Class && ((Class) type).isArray() && componentInfo.isTupleType() && type != Tuple.class) { return new ObjectArrayTypeInfo(type, ((Class) type).getComponentType(), componentInfo); } -- GitLab