From fc4dceaa991ecacf0d248725decd5370622ea0ed Mon Sep 17 00:00:00 2001 From: Saksham Srivastava Date: Wed, 22 Oct 2014 13:53:41 +0530 Subject: [PATCH] CLOUDSTACK-7582: Update Storage Pool API does not update tags correctly --- .../storage/datastore/db/PrimaryDataStoreDaoImpl.java | 3 +++ server/src/com/cloud/storage/StorageManagerImpl.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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 0c372a5b99a..ae2287e9181 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 @@ -435,6 +435,9 @@ public class PrimaryDataStoreDaoImpl extends GenericDaoBase 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 index 297f1ce869b..11843205a4f 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -799,7 +799,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C } } - if (updatedDetails.size() > 0) { + if (updatedDetails.size() >= 0) { _storagePoolDao.updateDetails(id, updatedDetails); }