Fix CLOUDSTACK-2062 NPE while deleting the primary storage[Added with scope=cluster]

Mice Xia · Mice Xia · commit 7cc82db345b3 · 2013-04-17T22:06:45.000+08:00
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
@@ -532,8 +532,7 @@ public boolean deleteDataStore(DataStore store) {
             throw new CloudRuntimeException("Failed to delete storage pool on host");
         }
         
-        this.dataStoreHelper.deletePrimaryDataStore(store);
-        return false;
+        return this.dataStoreHelper.deletePrimaryDataStore(store);
     }
 
     @Override
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -963,9 +963,7 @@ public boolean deletePool(DeletePoolCmd cmd) {
         DataStoreLifeCycle lifeCycle = storeProvider.getDataStoreLifeCycle();
         DataStore store = dataStoreMgr.getDataStore(
                 sPool.getId(), DataStoreRole.Primary);
-        lifeCycle.deleteDataStore(store);
-
-        return false;
+        return lifeCycle.deleteDataStore(store);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -532,8 +532,7 @@ public boolean deleteDataStore(DataStore store) {`
`532`	`532`	`throw new CloudRuntimeException("Failed to delete storage pool on host");`
`533`	`533`	`}`
`534`	`534`
`535`		`- this.dataStoreHelper.deletePrimaryDataStore(store);`
`536`		`- return false;`
	`535`	`+ return this.dataStoreHelper.deletePrimaryDataStore(store);`
`537`	`536`	`}`
`538`	`537`
`539`	`538`	`@Override`