Merge branch 'master' of swgilluminati.com:DarthArgus/src

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<const GameNetworkMessage &>(message).getByteStream().begin();
+		ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
 		GenericValueTypeMessage<std::pair<std::string, std::string> > 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<ConnectionServerConnection>(), 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.
 		{

engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp

@@ -1006,7 +1006,7 @@ void ClientConnection::onReceive(const Archive::ByteStream & message)
 			else
 			{
 				//Forward on to Game Server
-				DEBUG_REPORT_LOG(!m_client || !m_client->getGameConnection()), ("Warn, received game message with no game connection.  This may happen for a short time after a GameServer crashes.  If it continues to happen, it indicates a bug.\n");
+				DEBUG_REPORT_LOG((!m_client || !m_client->getGameConnection()), ("Warn, received game message with no game connection.  This may happen for a short time after a GameServer crashes.  If it continues to happen, it indicates a bug.\n"));
 
 				if (m_client && m_client->getGameConnection())
 				{

engine/server/library/serverScript/src/shared/JavaLibrary.cpp

@@ -1283,7 +1283,6 @@ void JavaLibrary::initializeJavaThread()
 				strcpy(profileBuffer,"-Xrunhprof:cpu=times");
 				tempOption.optionString = profileBuffer;
 				options.push_back(tempOption);
-				delete [] profileBuffer;
 			}
 			else
 			{

engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.cpp

@@ -92,7 +92,7 @@ RemoteDebug::Variable::Variable(const std::string& name, void *memLoc, VARIABLE_
 			break;
 
 		case CSTRING:
-			m_value.stringValue = s;
+			m_value.stringValue = &s;
 			break;
 
 		case BOOL:

engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.h

@@ -45,7 +45,7 @@ class RemoteDebug::Variable
 			int32 intValue;
 			float floatValue;
 			int32 boolValue;
-			char stringValue;
+			char* stringValue;
 		};
 		
 		Variable(const std::string& name, void *memLoc, VARIABLE_TYPES type);

engine/shared/library/sharedFile/src/shared/FileStreamerThread.h

@@ -115,7 +115,7 @@ public:
 	AbstractFile::PriorityType  priority;
 
 	// storage held by game thread used to pass back return value
-	int                        returnValue;
+	int                        *returnValue;
 
 public: