You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2016/05/13 00:33:50 UTC
[4/6] kylin git commit: KYLIN-1685 Close unclosed resouces if
DriverTest
KYLIN-1685 Close unclosed resouces if DriverTest
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/407fbd0d
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/407fbd0d
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/407fbd0d
Branch: refs/heads/1.5.x-HBase1.x
Commit: 407fbd0d4600daa4a65f09628558fcea72863473
Parents: 7101f09
Author: lidongsjtu <li...@apache.org>
Authored: Thu May 12 21:24:36 2016 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Thu May 12 21:27:08 2016 +0800
----------------------------------------------------------------------
jdbc/src/main/java/org/apache/kylin/jdbc/KylinResultSet.java | 5 ++---
jdbc/src/test/java/org/apache/kylin/jdbc/DriverTest.java | 4 ++++
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/407fbd0d/jdbc/src/main/java/org/apache/kylin/jdbc/KylinResultSet.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/kylin/jdbc/KylinResultSet.java b/jdbc/src/main/java/org/apache/kylin/jdbc/KylinResultSet.java
index 767b543..a6117cc 100644
--- a/jdbc/src/main/java/org/apache/kylin/jdbc/KylinResultSet.java
+++ b/jdbc/src/main/java/org/apache/kylin/jdbc/KylinResultSet.java
@@ -50,10 +50,9 @@ public class KylinResultSet extends AvaticaResultSet {
String sql = signature.sql;
List<AvaticaParameter> params = signature.parameters;
List<Object> paramValues = null;
- if(statement instanceof KylinStatement) {
+ if (!(statement instanceof KylinPreparedStatement)) {
params = null;
- }
- if (params != null && params.size() > 0) {
+ } else if (params != null && params.size() > 0) {
paramValues = ((KylinPreparedStatement) statement).getParameterValues2();
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/407fbd0d/jdbc/src/test/java/org/apache/kylin/jdbc/DriverTest.java
----------------------------------------------------------------------
diff --git a/jdbc/src/test/java/org/apache/kylin/jdbc/DriverTest.java b/jdbc/src/test/java/org/apache/kylin/jdbc/DriverTest.java
index c773244..68a6d0b 100644
--- a/jdbc/src/test/java/org/apache/kylin/jdbc/DriverTest.java
+++ b/jdbc/src/test/java/org/apache/kylin/jdbc/DriverTest.java
@@ -88,6 +88,10 @@ public class DriverTest {
assertEquals("bar", resultSet.getString(2));
assertEquals("tool", resultSet.getString(3));
}
+
+ resultSet.close();
+ state.close();
+ conn.close();
}
@Test