Repository: incubator-trafodion Updated Branches: refs/heads/master accb00a6a -> adb821b5d
Close statements while executing new query Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/3f808716 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/3f808716 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/3f808716 Branch: refs/heads/master Commit: 3f808716c12ebc8d6acca0d50c23b4c47c20f4bb Parents: 0f302c4 Author: Kevin Xu <[email protected]> Authored: Wed Jan 27 16:23:14 2016 +0800 Committer: Kevin Xu <[email protected]> Committed: Wed Jan 27 16:23:14 2016 +0800 ---------------------------------------------------------------------- .../trafodion/dcs/servermt/serverHandler/ServerApiSqlExecute.java | 1 + .../java/org/trafodion/dcs/servermt/serverSql/TrafStatement.java | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3f808716/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecute.java ---------------------------------------------------------------------- diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecute.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecute.java index ed56cc3..d0c7a64 100644 --- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecute.java +++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecute.java @@ -305,6 +305,7 @@ public class ServerApiSqlExecute { rs = pstmt.executeQuery(); if (rs != null) { outDescList = trafStmt.getOutDescList(); + trafStmt.closeAllTResultSets(); trafStmt.addTResultSet(new TrafResultSet(rs, 0, stmtLabel, 0, trafStmt.getOutDescList(),"")); } } else if (isSpj == true) { http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3f808716/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafStatement.java ---------------------------------------------------------------------- diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafStatement.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafStatement.java index 4fa22d4..2c3d9e2 100644 --- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafStatement.java +++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafStatement.java @@ -146,6 +146,7 @@ public class TrafStatement { if (resultSetList.containsKey(key)){ if (LOG.isDebugEnabled()) LOG.debug(serverWorkerName + ". getNextTResultSet returns true "); + ++curKey; return true; } }
