findbugs: retrieve the objects to remove from the collection(s)

Daan Hoogland · Daan Hoogland · commit fe262caa7561 · 2014-01-28T15:36:40.000+01:00
diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -165,7 +165,7 @@ public List<StoragePoolAllocator> getStoragePoolAllocators() {
     }
 
     public void setStoragePoolAllocators(List<StoragePoolAllocator> storagePoolAllocators) {
-        this._storagePoolAllocators = storagePoolAllocators;
+        _storagePoolAllocators = storagePoolAllocators;
     }
 
     protected List<HostAllocator> _hostAllocators;
@@ -175,7 +175,7 @@ public List<HostAllocator> getHostAllocators() {
     }
 
     public void setHostAllocators(List<HostAllocator> hostAllocators) {
-        this._hostAllocators = hostAllocators;
+        _hostAllocators = hostAllocators;
     }
 
     @Inject
@@ -221,7 +221,7 @@ public List<DeploymentPlanner> getPlanners() {
     }
 
     public void setPlanners(List<DeploymentPlanner> planners) {
-        this._planners = planners;
+        _planners = planners;
     }
 
     protected List<AffinityGroupProcessor> _affinityProcessors;
@@ -231,7 +231,7 @@ public List<AffinityGroupProcessor> getAffinityGroupProcessors() {
     }
 
     public void setAffinityGroupProcessors(List<AffinityGroupProcessor> affinityProcessors) {
-        this._affinityProcessors = affinityProcessors;
+        _affinityProcessors = affinityProcessors;
     }
 
     @Override
@@ -1142,9 +1142,9 @@ protected Pair<Map<Volume, List<StoragePool>>, List<Volume>> findSuitablePoolsFo
                 List<StoragePool> suitablePools = new ArrayList<StoragePool>();
                 StoragePool pool = null;
                 if (toBeCreated.getPoolId() != null) {
-                    pool = (StoragePool)this.dataStoreMgr.getPrimaryDataStore(toBeCreated.getPoolId());
+                    pool = (StoragePool)dataStoreMgr.getPrimaryDataStore(toBeCreated.getPoolId());
                 } else {
-                    pool = (StoragePool)this.dataStoreMgr.getPrimaryDataStore(plan.getPoolId());
+                    pool = (StoragePool)dataStoreMgr.getPrimaryDataStore(plan.getPoolId());
                 }
 
                 if (!pool.isInMaintenance()) {
@@ -1156,7 +1156,7 @@ protected Pair<Map<Volume, List<StoragePool>>, List<Volume>> findSuitablePoolsFo
                         if (plan.getDataCenterId() == exstPoolDcId && plan.getPodId() == exstPoolPodId && plan.getClusterId() == exstPoolClusterId) {
                             canReusePool = true;
                         } else if (plan.getDataCenterId() == exstPoolDcId) {
-                            DataStore dataStore = this.dataStoreMgr.getPrimaryDataStore(pool.getId());
+                            DataStore dataStore = dataStoreMgr.getPrimaryDataStore(pool.getId());
                             if (dataStore != null && dataStore.getScope() != null && dataStore.getScope().getScopeType() == ScopeType.ZONE) {
                                 canReusePool = true;
                             }
@@ -1259,9 +1259,14 @@ protected Pair<Map<Volume, List<StoragePool>>, List<Volume>> findSuitablePoolsFo
             }
         }
 
-        if (suitableVolumeStoragePools.values() != null) {
-            poolsToAvoidOutput.removeAll(suitableVolumeStoragePools.values());
+        HashSet<Long> toRemove = new HashSet<Long>();
+        for (List<StoragePool> lsp : suitableVolumeStoragePools.values()) {
+            for (StoragePool sp : lsp) {
+                toRemove.add(sp.getId());
+            }
         }
+        poolsToAvoidOutput.removeAll(toRemove);
+
         if (avoid.getPoolsToAvoid() != null) {
             avoid.getPoolsToAvoid().addAll(poolsToAvoidOutput);
         }

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ public List<StoragePoolAllocator> getStoragePoolAllocators() {`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`public void setStoragePoolAllocators(List<StoragePoolAllocator> storagePoolAllocators) {`
`168`		`- this._storagePoolAllocators = storagePoolAllocators;`
	`168`	`+ _storagePoolAllocators = storagePoolAllocators;`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`protected List<HostAllocator> _hostAllocators;`
`@@ -175,7 +175,7 @@ public List<HostAllocator> getHostAllocators() {`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`public void setHostAllocators(List<HostAllocator> hostAllocators) {`
`178`		`- this._hostAllocators = hostAllocators;`
	`178`	`+ _hostAllocators = hostAllocators;`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`@Inject`
`@@ -221,7 +221,7 @@ public List<DeploymentPlanner> getPlanners() {`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`public void setPlanners(List<DeploymentPlanner> planners) {`
`224`		`- this._planners = planners;`
	`224`	`+ _planners = planners;`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`protected List<AffinityGroupProcessor> _affinityProcessors;`
`@@ -231,7 +231,7 @@ public List<AffinityGroupProcessor> getAffinityGroupProcessors() {`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`public void setAffinityGroupProcessors(List<AffinityGroupProcessor> affinityProcessors) {`
`234`		`- this._affinityProcessors = affinityProcessors;`
	`234`	`+ _affinityProcessors = affinityProcessors;`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`@Override`
`@@ -1142,9 +1142,9 @@ protected Pair<Map<Volume, List<StoragePool>>, List<Volume>> findSuitablePoolsFo`
`1142`	`1142`	`List<StoragePool> suitablePools = new ArrayList<StoragePool>();`
`1143`	`1143`	`StoragePool pool = null;`
`1144`	`1144`	`if (toBeCreated.getPoolId() != null) {`
`1145`		`- pool = (StoragePool)this.dataStoreMgr.getPrimaryDataStore(toBeCreated.getPoolId());`
	`1145`	`+ pool = (StoragePool)dataStoreMgr.getPrimaryDataStore(toBeCreated.getPoolId());`
`1146`	`1146`	`} else {`
`1147`		`- pool = (StoragePool)this.dataStoreMgr.getPrimaryDataStore(plan.getPoolId());`
	`1147`	`+ pool = (StoragePool)dataStoreMgr.getPrimaryDataStore(plan.getPoolId());`
`1148`	`1148`	`}`
`1149`	`1149`
`1150`	`1150`	`if (!pool.isInMaintenance()) {`
`@@ -1156,7 +1156,7 @@ protected Pair<Map<Volume, List<StoragePool>>, List<Volume>> findSuitablePoolsFo`
`1156`	`1156`	`if (plan.getDataCenterId() == exstPoolDcId && plan.getPodId() == exstPoolPodId && plan.getClusterId() == exstPoolClusterId) {`
`1157`	`1157`	`canReusePool = true;`
`1158`	`1158`	`} else if (plan.getDataCenterId() == exstPoolDcId) {`
`1159`		`- DataStore dataStore = this.dataStoreMgr.getPrimaryDataStore(pool.getId());`
	`1159`	`+ DataStore dataStore = dataStoreMgr.getPrimaryDataStore(pool.getId());`
`1160`	`1160`	`if (dataStore != null && dataStore.getScope() != null && dataStore.getScope().getScopeType() == ScopeType.ZONE) {`
`1161`	`1161`	`canReusePool = true;`
`1162`	`1162`	`}`
`@@ -1259,9 +1259,14 @@ protected Pair<Map<Volume, List<StoragePool>>, List<Volume>> findSuitablePoolsFo`
`1259`	`1259`	`}`
`1260`	`1260`	`}`
`1261`	`1261`
`1262`		`- if (suitableVolumeStoragePools.values() != null) {`
`1263`		`- poolsToAvoidOutput.removeAll(suitableVolumeStoragePools.values());`
	`1262`	`+ HashSet<Long> toRemove = new HashSet<Long>();`
	`1263`	`+ for (List<StoragePool> lsp : suitableVolumeStoragePools.values()) {`
	`1264`	`+ for (StoragePool sp : lsp) {`
	`1265`	`+ toRemove.add(sp.getId());`
	`1266`	`+ }`
`1264`	`1267`	`}`
	`1268`	`+ poolsToAvoidOutput.removeAll(toRemove);`
	`1269`	`+`
`1265`	`1270`	`if (avoid.getPoolsToAvoid() != null) {`
`1266`	`1271`	`avoid.getPoolsToAvoid().addAll(poolsToAvoidOutput);`
`1267`	`1272`	`}`