From bd4f3699c2704db31fa6cf3e36369f17abc9445b Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Tue, 27 Oct 2015 21:19:20 -0500 Subject: [PATCH] squash bugs --- .../ConnectionServer/src/shared/ClientConnection.cpp | 2 +- engine/server/library/serverScript/src/shared/JavaLibrary.cpp | 1 - engine/shared/library/sharedFile/src/shared/FileStreamer.cpp | 2 +- .../shared/library/sharedFile/src/shared/FileStreamerThread.h | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp b/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp index 50f2ee0f..f7b3020b 100644 --- a/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp +++ b/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()) { diff --git a/engine/server/library/serverScript/src/shared/JavaLibrary.cpp b/engine/server/library/serverScript/src/shared/JavaLibrary.cpp index 24c28a00..2ae597df 100644 --- a/engine/server/library/serverScript/src/shared/JavaLibrary.cpp +++ b/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 { diff --git a/engine/shared/library/sharedFile/src/shared/FileStreamer.cpp b/engine/shared/library/sharedFile/src/shared/FileStreamer.cpp index 18f57271..6c47b26c 100644 --- a/engine/shared/library/sharedFile/src/shared/FileStreamer.cpp +++ b/engine/shared/library/sharedFile/src/shared/FileStreamer.cpp @@ -229,7 +229,7 @@ int FileStreamer::File::read(int offset, void *destinationBuffer, int numberOfBy newRequest->bytesRead = 0; newRequest->gate = gate; newRequest->priority = priority; - newRequest->returnValue = returnValue; + newRequest->returnValue = &returnValue; // submit the request FileStreamerThread::submitRequest(newRequest); diff --git a/engine/shared/library/sharedFile/src/shared/FileStreamerThread.h b/engine/shared/library/sharedFile/src/shared/FileStreamerThread.h index 1431c78a..1d9787b7 100644 --- a/engine/shared/library/sharedFile/src/shared/FileStreamerThread.h +++ b/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: