etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.reddy@citrix.com>
This commit is contained in:
Murali Reddy 2013-03-21 17:38:33 +05:30 committed by Chip Childers
parent ebc10b6bf0
commit 0e33ba8d35
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/com/cloud/network/Network.java
View File

@ -235,6 +235,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() {