CLOUDSTACK-7582: Update Storage Pool API does not update tags correctly

Sakshams · rajesh-battala · commit fc4dceaa991e · 2014-11-13T17:01:06.000+05:30
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
@@ -435,6 +435,9 @@ public void updateDetails(long poolId, Map<String, String> details) {
                 detailsVO.add(new StoragePoolDetailVO(poolId, key, details.get(key), true));
             }
             _detailsDao.saveDetails(detailsVO);
+            if(details.size() == 0) {
+                _detailsDao.removeDetails(poolId);
+            }
         }
     }
 
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -799,7 +799,7 @@ public PrimaryDataStoreInfo updateStoragePool(UpdateStoragePoolCmd cmd) throws I
             }
         }
 
-        if (updatedDetails.size() > 0) {
+        if (updatedDetails.size() >= 0) {
             _storagePoolDao.updateDetails(id, updatedDetails);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -435,6 +435,9 @@ public void updateDetails(long poolId, Map<String, String> details) {`
`435`	`435`	`detailsVO.add(new StoragePoolDetailVO(poolId, key, details.get(key), true));`
`436`	`436`	`}`
`437`	`437`	`_detailsDao.saveDetails(detailsVO);`
	`438`	`+ if(details.size() == 0) {`
	`439`	`+ _detailsDao.removeDetails(poolId);`
	`440`	`+ }`
`438`	`441`	`}`
`439`	`442`	`}`
`440`	`443`
Original file line number	Diff line number	Diff line change
`@@ -799,7 +799,7 @@ public PrimaryDataStoreInfo updateStoragePool(UpdateStoragePoolCmd cmd) throws I`
`799`	`799`	`}`
`800`	`800`	`}`
`801`	`801`
`802`		`- if (updatedDetails.size() > 0) {`
	`802`	`+ if (updatedDetails.size() >= 0) {`
`803`	`803`	`_storagePoolDao.updateDetails(id, updatedDetails);`
`804`	`804`	`}`
`805`	`805`