Repository: cloudstack Updated Branches: refs/heads/master 3bb344281 -> 2018d7d97
Fixed Coverity Issues Reported Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2018d7d9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2018d7d9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2018d7d9 Branch: refs/heads/master Commit: 2018d7d9777a6af0a79de51c3aaaebd3d094e6fc Parents: 3bb3442 Author: Santhosh Edukulla <santhosh.eduku...@gmail.com> Authored: Fri Jul 25 16:39:16 2014 +0530 Committer: Santhosh Edukulla <santhosh.eduku...@gmail.com> Committed: Fri Jul 25 16:39:16 2014 +0530 ---------------------------------------------------------------------- .../endpoint/DefaultEndPointSelector.java | 28 ++++++-------------- 1 file changed, 8 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2018d7d9/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java index f06b43e..0a867f6 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java +++ b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java @@ -115,33 +115,21 @@ public class DefaultEndPointSelector implements EndPointSelector { // TODO: order by rand() is slow if there are lot of hosts sbuilder.append(" ORDER by rand() limit 1"); String sql = sbuilder.toString(); - PreparedStatement pstmt = null; - ResultSet rs = null; HostVO host = null; TransactionLegacy txn = TransactionLegacy.currentTxn(); - - try { - pstmt = txn.prepareStatement(sql); + try(PreparedStatement pstmt = txn.prepareStatement(sql);) { pstmt.setLong(1, poolId); - rs = pstmt.executeQuery(); - while (rs.next()) { - long id = rs.getLong(1); - host = hostDao.findById(id); + try(ResultSet rs = pstmt.executeQuery();) { + while (rs.next()) { + long id = rs.getLong(1); + host = hostDao.findById(id); + } + }catch (SQLException e) { + s_logger.warn("can't find endpoint", e); } } catch (SQLException e) { s_logger.warn("can't find endpoint", e); - } finally { - try { - if (rs != null) { - rs.close(); - } - if (pstmt != null) { - pstmt.close(); - } - } catch (SQLException e) { - } } - if (host == null) { return null; }
