You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/06/17 22:49:45 UTC
git commit: updated refs/heads/master to b84093f
Repository: cloudstack
Updated Branches:
refs/heads/master 1407033cc -> b84093f69
Fix findbugs SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING warning in PrimaryDataStoreDaoImpl.java
Remove trailing spaces that checkstyle complained about
Signed-off-by: Daan Hoogland <da...@gmail.com>
This closes #474
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b84093f6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b84093f6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b84093f6
Branch: refs/heads/master
Commit: b84093f691ae0b09d2c525d50f2e2d200c709b2c
Parents: 1407033
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Wed Jun 17 20:25:00 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Wed Jun 17 22:46:58 2015 +0200
----------------------------------------------------------------------
.../datastore/db/PrimaryDataStoreDaoImpl.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b84093f6/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
index faf5291..d3c29f7 100644
--- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
+++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
@@ -392,20 +392,21 @@ public class PrimaryDataStoreDaoImpl extends GenericDaoBase<StoragePoolVO, Long>
StringBuilder sql = new StringBuilder(ZoneWideDetailsSqlPrefix);
- for (Map.Entry<String, String> detail : details.entrySet()) {
- sql.append("((storage_pool_details.name='")
- .append(detail.getKey())
- .append("') AND (storage_pool_details.value='")
- .append(detail.getValue())
- .append("')) OR ");
+ for (int i=0;i<details.size();i++){
+ sql.append("((storage_pool_details.name=?) AND (storage_pool_details.value=?)) OR ");
}
sql.delete(sql.length() - 4, sql.length());
sql.append(ZoneWideDetailsSqlSuffix);
TransactionLegacy txn = TransactionLegacy.currentTxn();
try (PreparedStatement pstmt = txn.prepareStatement(sql.toString());){
+ int i=0;
+ for (Map.Entry<String, String> detail : details.entrySet()) {
+ pstmt.setString(++i,detail.getKey());
+ pstmt.setString(++i,detail.getValue());
+ }
List<StoragePoolVO> pools = new ArrayList<StoragePoolVO>();
if (pstmt != null) {
- int i = 1;
+ i = 1;
pstmt.setLong(i++, dcId);
pstmt.setString(i++, ScopeType.ZONE.toString());
pstmt.setInt(i++, details.size());