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 D5E1B107B2 for ; Thu, 18 Apr 2013 02:25:57 +0000 (UTC) Received: (qmail 327 invoked by uid 500); 18 Apr 2013 02:25:52 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 275 invoked by uid 500); 18 Apr 2013 02:25:52 -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 99855 invoked by uid 99); 18 Apr 2013 02:25:51 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Apr 2013 02:25:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 862C8475E1; Thu, 18 Apr 2013 02:25:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: commits@cloudstack.apache.org Date: Thu, 18 Apr 2013 02:26:18 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [30/41] git commit: updated refs/heads/marvin_refactor to 94b18c6 CLOUDSTACK-2071 - VirtualMachineManagerImpl.java start() method for instance can fail to start a VM without notifying caller, if no exception is triggered. The result is that VM start looks successful but was not. This fixes it by throwing an exception at the very end if the object to be passed back is still null. Signed-off-by: Marcus Sorensen 1366225829 -0600 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8d0bea99 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8d0bea99 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8d0bea99 Branch: refs/heads/marvin_refactor Commit: 8d0bea994dcd74cd6707b58ac2e4060a93f52d96 Parents: 9584815 Author: Marcus Sorensen Authored: Wed Apr 17 13:10:29 2013 -0600 Committer: Marcus Sorensen Committed: Wed Apr 17 13:13:05 2013 -0600 ---------------------------------------------------------------------- .../com/cloud/vm/VirtualMachineManagerImpl.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d0bea99/server/src/com/cloud/vm/VirtualMachineManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java index 4072531..a53e380 100755 --- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -866,6 +866,11 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } } + if (startedVm == null) { + throw new CloudRuntimeException("Unable to start instance '" + vm.getHostName() + + "' (" + vm.getUuid() + "), see management server log for details"); + } + return startedVm; }