Updated Branches: refs/heads/master 789438651 -> 93172df55
CLOUDSTACK-3994: fix for Wrong error notification is generated when Primary storage is added with wrong path Signed-off-by: Sateesh Chodapuneedi <sate...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/93172df5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/93172df5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/93172df5 Branch: refs/heads/master Commit: 93172df5569cea02cecf1c4e57646910409ffb6d Parents: 7894386 Author: Anshul Gangwar <anshul.gang...@citrix.com> Authored: Fri Oct 4 15:05:50 2013 +0530 Committer: Sateesh Chodapuneedi <sate...@apache.org> Committed: Thu Oct 17 13:21:58 2013 +0530 ---------------------------------------------------------------------- .../lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93172df5/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 9a70124..5e0dd95 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 @@ -472,6 +472,8 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl implements PrimaryDataStore HypervisorType hType = null; if(hostPoolRecords.size() > 0 ){ hType = getHypervisorType(hostPoolRecords.get(0).getHostId()); + } else { + return false; } // Remove the SR associated with the Xenserver
