Merge branch 'MXS-212' into develop

2015-06-23 17:11:23 +03:00
parent abf39303d7 c42d3d9f7a
commit da987e895a
3 changed files with 26 additions and 12 deletions
--- a/server/core/dcb.c
+++ b/server/core/dcb.c
@ -2423,6 +2423,9 @@ static bool dcb_set_state_nomutex(
                
        case DCB_STATE_NOPOLLING:
                switch (new_state) {
+		    /** Stopped services which are restarting will go from
+		     *  DCB_STATE_NOPOLLING to DCB_STATE_LISTENING.*/
+			case DCB_STATE_LISTENING:
 			case DCB_STATE_ZOMBIE: /*< fall through */
 				dcb->state = new_state;
 			case DCB_STATE_POLLING: /*< ok to try but state can't change */