apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correcting an issue that was introduced with b84093f691ae0b09d2c525d50f2e2d200c709b2c

Browse Source
This commit is contained in:
Mike Tutkowski 2015-07-30 17:29:32 -06:00
parent c9857cae25
commit 406c2c00b2
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
View File

@ -380,7 +380,6 @@ public class PrimaryDataStoreDaoImpl extends GenericDaoBase<StoragePoolVO, Long>
@Override
public List<StoragePoolVO> findZoneWideStoragePoolsByTags(long dcId, String[] tags) {
List<StoragePoolVO> storagePools = null;
if (tags == null || tags.length == 0) {
QueryBuilder<StoragePoolVO> sc = QueryBuilder.create(StoragePoolVO.class);
sc.and(sc.entity().getDataCenterId(), Op.EQ, dcId);
@ -399,17 +398,20 @@ public class PrimaryDataStoreDaoImpl extends GenericDaoBase<StoragePoolVO, Long>
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) {
i = 1;
int i = 1;
pstmt.setLong(i++, dcId);
pstmt.setString(i++, ScopeType.ZONE.toString());
for (Map.Entry<String, String> detail : details.entrySet()) {
pstmt.setString(i++, detail.getKey());
pstmt.setString(i++, detail.getValue());
}
pstmt.setInt(i++, details.size());
try(ResultSet rs = pstmt.executeQuery();) {
while (rs.next()) {
pools.add(toEntityBean(rs, false));