Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D52D7179D6 for ; Fri, 19 Jun 2015 10:17:29 +0000 (UTC) Received: (qmail 82076 invoked by uid 500); 19 Jun 2015 10:17:29 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 82046 invoked by uid 500); 19 Jun 2015 10:17:29 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 82037 invoked by uid 99); 19 Jun 2015 10:17:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jun 2015 10:17:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 95C1CE025B; Fri, 19 Jun 2015 10:17:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sanjaytripathi@apache.org To: commits@cloudstack.apache.org Message-Id: <50454b67bdb34a38b7cc6ca46efd84c4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 92a9ee0 Date: Fri, 19 Jun 2015 10:17:29 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master bcfb8240e -> 92a9ee097 AsyncJob reports 'Successful' even if RevertToVMSnapshot operation fails. This closes #484 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/92a9ee09 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/92a9ee09 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/92a9ee09 Branch: refs/heads/master Commit: 92a9ee097dfd4774bddc799f15ea76f0614d5062 Parents: bcfb824 Author: Sanjay Tripathi Authored: Fri Jun 19 15:46:07 2015 +0530 Committer: Sanjay Tripathi Committed: Fri Jun 19 15:48:21 2015 +0530 ---------------------------------------------------------------------- server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/92a9ee09/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java index b49db9b..2dcd2e2 100644 --- a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java +++ b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java @@ -709,7 +709,7 @@ public class VMSnapshotManagerImpl extends ManagerBase implements VMSnapshotMana return userVm; } catch (Exception e) { s_logger.debug("Failed to revert vmsnapshot: " + vmSnapshotId, e); - return null; + throw new CloudRuntimeException(e.getMessage()); } }