cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject git commit: updated refs/heads/master to 7cc82db
Date Wed, 17 Apr 2013 14:06:41 GMT
Updated Branches:
  refs/heads/master 167781ec0 -> 7cc82db34


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/master
Commit: 7cc82db345b341f4be3695dfd2406169fedba2c1
Parents: 167781e
Author: Mice Xia <mice_xia@tcloudcomputing.com>
Authored: Wed Apr 17 22:05:54 2013 +0800
Committer: Mice Xia <mice_xia@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


Mime
View raw message