Updated Branches: refs/heads/master 5a455a798 -> 1c845d42b
CLOUDSTACK-1368: Shared network - Not able to delete network because of java.lang.NullPointerException Missed network destroy state transistion while 'events framework' merge. Before merge, network states were explicitly set. It was changed to go through state machine. This fix, introduces missing state transistions. Tested life cycle of both isolated and shared network Signed-off-by: Murali Reddy <murali.re...@citrix.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1c845d42 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1c845d42 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1c845d42 Branch: refs/heads/master Commit: 1c845d42b703bf4608873fd777b9bfef5d3feee5 Parents: 5a455a7 Author: Murali Reddy <murali.re...@citrix.com> Authored: Thu Mar 21 17:38:33 2013 +0530 Committer: Murali Reddy <murali.re...@citrix.com> Committed: Fri Mar 22 11:20:48 2013 +0530 ---------------------------------------------------------------------- api/src/com/cloud/network/Network.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c845d42/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 89dac68..c2ab655 100644 --- a/api/src/com/cloud/network/Network.java +++ b/api/src/com/cloud/network/Network.java @@ -236,6 +236,8 @@ public interface Network extends ControlledEntity, StateObject<Network.State>, I 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.Setup, Event.DestroyNetwork, State.Destroy); + s_fsm.addTransition(State.Allocated, Event.DestroyNetwork, State.Destroy); } public static StateMachine2<State, Network.Event, Network> getStateMachine() {
