Repository: cloudstack Updated Branches: refs/heads/volume-upload a25d77473 -> e08522dba
volume upload: fixed NPE if SSVM is not up Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b343fb79 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b343fb79 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b343fb79 Branch: refs/heads/volume-upload Commit: b343fb79e3b9d9e93431fee356618a34201a3f96 Parents: a25d774 Author: Rajani Karuturi <[email protected]> Authored: Wed Jan 21 16:51:55 2015 +0530 Committer: Rajani Karuturi <[email protected]> Committed: Thu Jan 29 16:55:16 2015 +0530 ---------------------------------------------------------------------- .../org/apache/cloudstack/storage/volume/VolumeServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b343fb79/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java index 0d6aa56..532c982 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java @@ -1232,8 +1232,9 @@ public class VolumeServiceImpl implements VolumeService { EndPoint ep = _epSelector.select(store); if (ep == null) { - s_logger.warn("There is no secondary storage VM for image store " + store.getName()); - return null; + String errorMessage = "There is no secondary storage VM for image store " + store.getName(); + s_logger.warn(errorMessage); + throw new CloudRuntimeException(errorMessage); } return new Pair<>(ep,volumeOnStore); }
