Merge branch 'develop' into MXS-329-develop-20151111

2015-11-13 07:44:23 +02:00
parent 30d1fc66b7 1433d28f5f
commit 6b88b6b17f
66 changed files with 4807 additions and 4056 deletions
--- a/server/core/service.c
+++ b/server/core/service.c
@ -348,6 +348,7 @@ GWPROTOCOL	*funcs;
 		users_free(service->users);
        service->users = NULL;
 		dcb_close(port->listener);
+        service->users = NULL;
 		port->listener = NULL;
 		LOGIF(LE, (skygw_log_write_flush(
                        LOGFILE_ERROR,
@ -384,6 +385,7 @@ GWPROTOCOL	*funcs;
            service->users = NULL;
            dcb_close(port->listener);
 			port->listener = NULL;
+            service->users = NULL;
 			goto retblock;
                }
        }