You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/06/26 15:21:47 UTC
ambari git commit: AMBARI-12165 Don't overwrite Statement variable
before previous statement is closed (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 08450c06a -> d94a5da8f
AMBARI-12165 Don't overwrite Statement variable before previous statement is closed (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d94a5da8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d94a5da8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d94a5da8
Branch: refs/heads/trunk
Commit: d94a5da8fdb4da35e09aa2d00641aef18dac7520
Parents: 08450c0
Author: Dmytro Sen <ds...@apache.org>
Authored: Fri Jun 26 16:21:34 2015 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Fri Jun 26 16:21:34 2015 +0300
----------------------------------------------------------------------
.../org/apache/ambari/server/upgrade/UpgradeCatalog210.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d94a5da8/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
index 66c03fa..c485e02 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
@@ -886,9 +886,11 @@ public class UpgradeCatalog210 extends AbstractUpgradeCatalog {
HOSTS_TABLE, HOST_ID_COL, CLUSTER_HOST_MAPPING_TABLE);
ResultSet hostsNotInCluster = null;
Statement statement = null;
+ Statement duplicatedHostsStatement = null;
try {
statement = dbAccessor.getConnection().createStatement();
+ duplicatedHostsStatement = dbAccessor.getConnection().createStatement();
hostsNotInCluster = statement.executeQuery(hostsNotInClusterQuery);
if(hostsNotInCluster != null) {
while (hostsNotInCluster.next()) {
@@ -898,8 +900,7 @@ public class UpgradeCatalog210 extends AbstractUpgradeCatalog {
long count = 0;
ResultSet duplicateHosts = null;
try {
- statement = dbAccessor.getConnection().createStatement();
- duplicateHosts = statement.executeQuery(duplicateHostsQuery);
+ duplicateHosts = duplicatedHostsStatement.executeQuery(duplicateHostsQuery);
if (duplicateHosts != null && duplicateHosts.next()) {
count = duplicateHosts.getLong(1);
}
@@ -924,6 +925,9 @@ public class UpgradeCatalog210 extends AbstractUpgradeCatalog {
if (statement != null) {
statement.close();
}
+ if (duplicatedHostsStatement != null) {
+ duplicatedHostsStatement.close();
+ }
}
}