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 71E4510D7F for ; Mon, 13 Jan 2014 19:23:57 +0000 (UTC) Received: (qmail 33712 invoked by uid 500); 13 Jan 2014 18:03:22 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 32015 invoked by uid 500); 13 Jan 2014 18:00:54 -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 28732 invoked by uid 99); 13 Jan 2014 17:55:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Jan 2014 17:55:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 49EEA8311A4; Mon, 13 Jan 2014 17:55:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: muralireddy@apache.org To: commits@cloudstack.apache.org Date: Mon, 13 Jan 2014 17:55:33 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/4.3 to b6698f3 CLOUDSTACK-5849: Failed shutdown of the network causes network state to be changed to 'Implemented' Wrong network state transition s_fsm.addTransition(State.Shutdown, Event.OperationFailed,State.Implemented fix keeps state as Shutdown Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e1a15ea1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e1a15ea1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e1a15ea1 Branch: refs/heads/4.3 Commit: e1a15ea15b16a4389df2fe6f46285a2979b28778 Parents: 6bb15a0 Author: Murali Reddy Authored: Mon Jan 13 17:47:47 2014 +0530 Committer: Murali Reddy Committed: Mon Jan 13 23:24:12 2014 +0530 ---------------------------------------------------------------------- api/src/com/cloud/network/Network.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e1a15ea1/api/src/com/cloud/network/Network.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/Network.java b/api/src/com/cloud/network/Network.java index f83e6c3..a7701da 100644 --- a/api/src/com/cloud/network/Network.java +++ b/api/src/com/cloud/network/Network.java @@ -231,7 +231,7 @@ public interface Network extends ControlledEntity, StateObject, I s_fsm.addTransition(State.Implementing, Event.OperationFailed, State.Shutdown); s_fsm.addTransition(State.Implemented, Event.DestroyNetwork, State.Shutdown); s_fsm.addTransition(State.Shutdown, Event.OperationSucceeded, State.Allocated); - s_fsm.addTransition(State.Shutdown, Event.OperationFailed, State.Implemented); + s_fsm.addTransition(State.Shutdown, Event.OperationFailed, State.Shutdown); s_fsm.addTransition(State.Setup, Event.DestroyNetwork, State.Destroy); s_fsm.addTransition(State.Allocated, Event.DestroyNetwork, State.Destroy); }