etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Mice Xia 2013-04-17 22:05:54 +08:00
parent 167781ec01
commit 7cc82db345
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java
View File

@ -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

4
server/src/com/cloud/storage/StorageManagerImpl.java
View File

@ -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