You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/04/17 20:09:34 UTC
[23/25] git commit: updated refs/heads/ui-mixed-zone-management to
c3009e3
Fix CLOUDSTACK-2062 NPE while deleting the primary storage[Added with scope=cluster]
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7cc82db3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7cc82db3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7cc82db3
Branch: refs/heads/ui-mixed-zone-management
Commit: 7cc82db345b341f4be3695dfd2406169fedba2c1
Parents: 167781e
Author: Mice Xia <mi...@tcloudcomputing.com>
Authored: Wed Apr 17 22:05:54 2013 +0800
Committer: Mice Xia <mi...@tcloudcomputing.com>
Committed: Wed Apr 17 22:06:45 2013 +0800
----------------------------------------------------------------------
.../CloudStackPrimaryDataStoreLifeCycleImpl.java | 3 +--
.../src/com/cloud/storage/StorageManagerImpl.java | 4 +---
2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7cc82db3/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java
index 51ea212..a0c991b 100644
--- a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java
+++ b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java
@@ -532,8 +532,7 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl implements
throw new CloudRuntimeException("Failed to delete storage pool on host");
}
- this.dataStoreHelper.deletePrimaryDataStore(store);
- return false;
+ return this.dataStoreHelper.deletePrimaryDataStore(store);
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7cc82db3/server/src/com/cloud/storage/StorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 4e410e4..a182e39 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -963,9 +963,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
DataStoreLifeCycle lifeCycle = storeProvider.getDataStoreLifeCycle();
DataStore store = dataStoreMgr.getDataStore(
sPool.getId(), DataStoreRole.Primary);
- lifeCycle.deleteDataStore(store);
-
- return false;
+ return lifeCycle.deleteDataStore(store);
}
@Override