Updated Branches: refs/heads/4.2 8b0894b27 -> f52533c81
CLOUDSTACK-3994: fix for Wrong error notification is generated when Primary storage is added with wrong path Signed-off-by: Sateesh Chodapuneedi <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f52533c8 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f52533c8 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f52533c8 Branch: refs/heads/4.2 Commit: f52533c819b46483cda6647e0a9ae30a7558acea Parents: 8b0894b Author: Anshul Gangwar <[email protected]> Authored: Fri Oct 4 15:05:50 2013 +0530 Committer: Sateesh Chodapuneedi <[email protected]> Committed: Thu Oct 17 13:17:43 2013 +0530 ---------------------------------------------------------------------- .../lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f52533c8/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 b9b7424..7555c1e 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 @@ -454,6 +454,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
