ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject [2/2] ambari git commit: AMBARI-12045. Ambari Upgrade: failed 2.0.1 -> 2.1.0 (aonishuk)
Date Sat, 20 Jun 2015 16:37:31 GMT
AMBARI-12045. Ambari Upgrade: failed 2.0.1 -> 2.1.0  (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/80440d2b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/80440d2b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/80440d2b

Branch: refs/heads/branch-2.1
Commit: 80440d2b5548698614b0e677a52acb2e57efca8f
Parents: e15b758
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Sat Jun 20 19:37:20 2015 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Sat Jun 20 19:37:20 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ambari/server/orm/DBAccessorImpl.java    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/80440d2b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
index 6e31eee..e4468d0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
@@ -662,17 +662,13 @@ public class DBAccessorImpl implements DBAccessor {
   @Override
   public ResultSet executeSelect(String query) throws SQLException {
     Statement statement = getConnection().createStatement();
-    ResultSet rs = statement.executeQuery(query);
-    statement.closeOnCompletion();
-    return rs;
+    return statement.executeQuery(query);
   }
 
   @Override
   public ResultSet executeSelect(String query, int resultSetType, int resultSetConcur) throws
SQLException {
     Statement statement = getConnection().createStatement(resultSetType, resultSetConcur);
-    ResultSet rs = statement.executeQuery(query);
-    statement.closeOnCompletion();
-    return rs;
+    return statement.executeQuery(query);
   }  
   
   @Override


Mime
View raw message