From 2ea7dd2b8391c112d150ee078632bacd4732a4b9 Mon Sep 17 00:00:00 2001 From: moparisthebest Date: Fri, 11 May 2018 11:14:27 -0400 Subject: [PATCH] Update NewDefaultObjectResultSetMapper for new toType signature from upstream --- .../controls/system/jdbc/NewDefaultObjectResultSetMapper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/beehive-jdbc-control/src/main/java/org/apache/beehive/controls/system/jdbc/NewDefaultObjectResultSetMapper.java b/beehive-jdbc-control/src/main/java/org/apache/beehive/controls/system/jdbc/NewDefaultObjectResultSetMapper.java index 36142f3..621e1fa 100644 --- a/beehive-jdbc-control/src/main/java/org/apache/beehive/controls/system/jdbc/NewDefaultObjectResultSetMapper.java +++ b/beehive-jdbc-control/src/main/java/org/apache/beehive/controls/system/jdbc/NewDefaultObjectResultSetMapper.java @@ -28,7 +28,8 @@ public class NewDefaultObjectResultSetMapper extends com.moparisthebest.jdbc.Cas @SuppressWarnings({"unchecked"}) public Object mapToResultType(ControlBeanContext context, Method m, ResultSet rs, Calendar cal) { final Type type = m.getGenericReturnType(); - return toType(rs, m.getReturnType(), type instanceof ParameterizedType ? (ParameterizedType) type : null, context.getMethodPropertySet(m, JdbcControl.SQL.class).arrayMaxLength(), cal); + // todo: is genericArray: false correct here? good enough I guess... + return toType(rs, m.getReturnType(), type instanceof ParameterizedType ? (ParameterizedType) type : null, false, context.getMethodPropertySet(m, JdbcControl.SQL.class).arrayMaxLength(), cal); } // todo: true is probably not valid for Stream and ResultSetIterable