You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2014/01/13 13:20:11 UTC
git commit: updated refs/heads/master to 470f251
Updated Branches:
refs/heads/master 3bea60435 -> 470f251cb
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/470f251c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/470f251c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/470f251c
Branch: refs/heads/master
Commit: 470f251cbb5cd32cb7fca60c0bb533db5927c095
Parents: 3bea604
Author: Murali Reddy <mu...@gmail.com>
Authored: Mon Jan 13 17:47:47 2014 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Mon Jan 13 17:47:47 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/470f251c/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 0b76789..2197c2b 100644
--- a/api/src/com/cloud/network/Network.java
+++ b/api/src/com/cloud/network/Network.java
@@ -225,7 +225,7 @@ public interface Network extends ControlledEntity, StateObject<Network.State>, 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);
}