Repository: kylin Updated Branches: refs/heads/1.3.x 72a247713 -> 9761ea3d4
KYLIN-1574 Unclosed ResultSet in QueryService#getMetadata() Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/9761ea3d Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/9761ea3d Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/9761ea3d Branch: refs/heads/1.3.x Commit: 9761ea3d4fa5234d260e24eace3319b925214a79 Parents: 72a2477 Author: Ted Yu <yuzhih...@gmail.com> Authored: Thu Apr 14 20:27:45 2016 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Thu Apr 14 20:27:51 2016 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/kylin/rest/service/QueryService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/9761ea3d/server/src/main/java/org/apache/kylin/rest/service/QueryService.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/kylin/rest/service/QueryService.java b/server/src/main/java/org/apache/kylin/rest/service/QueryService.java index 764df4b..5a55586 100644 --- a/server/src/main/java/org/apache/kylin/rest/service/QueryService.java +++ b/server/src/main/java/org/apache/kylin/rest/service/QueryService.java @@ -277,14 +277,14 @@ public class QueryService extends BasicService { Connection conn = null; ResultSet columnMeta = null; List<TableMeta> tableMetas = null; - + ResultSet JDBCTableMeta = null; try { DataSource dataSource = getOLAPDataSource(project); conn = dataSource.getConnection(); DatabaseMetaData metaData = conn.getMetaData(); logger.debug("getting table metas"); - ResultSet JDBCTableMeta = metaData.getTables(null, null, null, null); + JDBCTableMeta = metaData.getTables(null, null, null, null); tableMetas = new LinkedList<TableMeta>(); Map<String, TableMeta> tableMap = new HashMap<String, TableMeta>(); @@ -318,6 +318,9 @@ public class QueryService extends BasicService { logger.debug("done column metas"); } finally { close(columnMeta, null, conn); + if (JDBCTableMeta != null) { + JDBCTableMeta.close(); + } } return tableMetas;
