diff --git a/engine/server/application/CentralServer/src/shared/CentralServer.cpp b/engine/server/application/CentralServer/src/shared/CentralServer.cpp index f7110e13..35d9e51c 100644 --- a/engine/server/application/CentralServer/src/shared/CentralServer.cpp +++ b/engine/server/application/CentralServer/src/shared/CentralServer.cpp @@ -1177,6 +1177,7 @@ void CentralServer::receiveMessage(const MessageDispatch::Emitter & source, cons else if(message.isType("DatabaseConsoleReplyMessage")) { Archive::ReadIterator ri = static_cast(message).getByteStream().begin(); + ri = static_cast(message).getByteStream().begin(); GenericValueTypeMessage > msg(ri); IGNORE_RETURN(sendToRandomGameServer(msg)); @@ -2656,6 +2657,7 @@ void CentralServer::run(void) setup.port = ConfigCentralServer::getConnectionServicePort(); setup.bindInterface = ConfigCentralServer::getConnectionServiceBindInterface(); Service * cons = new Service(ConnectionAllocator(), setup); + NOT_NULL(cons); cserver.m_connService = cons; setup.port = ConfigCentralServer::getConsoleServicePort(); @@ -2741,7 +2743,7 @@ void CentralServer::run(void) Os::sleep(1); } - } while (!cserver.m_done); + } while (!barrierReached && !cserver.m_done); //@todo Central needs to run a clock so we can schedule re-tries with the login server. {