From 8ac701ea4a3ae6efb2674498d9f042ae371c2146 Mon Sep 17 00:00:00 2001 From: moparisthebest Date: Thu, 20 Apr 2017 14:53:43 -0400 Subject: [PATCH] Fix NewDefaultObjectResultSetMapper --- .../controls/system/jdbc/NewDefaultObjectResultSetMapper.java | 2 +- 1 file changed, 1 insertion(+), 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 102b62f..e98c468 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 @@ -40,7 +40,7 @@ public class NewDefaultObjectResultSetMapper extends com.moparisthebest.jdbc.Cas if (Collection.class.isAssignableFrom(collectionType)) return toMapCollection(rs, returnType, (Class) types[0], collectionType, (Class) pt.getActualTypeArguments()[0], context.getMethodPropertySet(m, JdbcControl.SQL.class).arrayMaxLength(), cal); } - return toMap(rs, returnType, (Class) types[0], (Class) types[1], context.getMethodPropertySet(m, JdbcControl.SQL.class).arrayMaxLength(), cal); + return toMap(rs, com.moparisthebest.jdbc.ResultSetMapper.instantiateClass((Class)returnType, HashMap.class), (Class) types[0], (Class) types[1], context.getMethodPropertySet(m, JdbcControl.SQL.class).arrayMaxLength(), cal); } else if (Iterator.class.isAssignableFrom(returnType)) { return ListIterator.class.isAssignableFrom(returnType) ? toListIterator(rs, (Class) getActualTypeArguments(m)[0], context.getMethodPropertySet(m, JdbcControl.SQL.class).arrayMaxLength(), cal) :