diff --git a/src/mangosd/MaNGOSsoap.cpp b/src/mangosd/MaNGOSsoap.cpp index eb7c1a06e..adef52553 100644 --- a/src/mangosd/MaNGOSsoap.cpp +++ b/src/mangosd/MaNGOSsoap.cpp @@ -129,7 +129,11 @@ int ns1__executeCommand(soap* soap, char* command, char** result) // wait for callback to complete command - connection.pendingCommands.acquire(); + int acc = connection.pendingCommands.acquire(); + if(acc) + { + sLog.outError("MaNGOSsoap: Error while acquiring lock, acc = %i, errno = %u", acc, errno); + } // alright, command finished diff --git a/src/mangosd/MaNGOSsoap.h b/src/mangosd/MaNGOSsoap.h index 0cf24e2dd..14d6c56ae 100644 --- a/src/mangosd/MaNGOSsoap.h +++ b/src/mangosd/MaNGOSsoap.h @@ -27,7 +27,7 @@ #include "soapH.h" #include "soapStub.h" -#include +#include #include @@ -78,11 +78,9 @@ class SOAPWorkingThread : public ACE_Task class SOAPCommand { public: - SOAPCommand() + SOAPCommand(): + pendingCommands(0, USYNC_THREAD, "pendingCommands") { - ACE_ASSERT (pendingCommands.open("pendingCommands", - ACE_SV_Semaphore_Simple::ACE_CREATE, - 0) != -1); } ~SOAPCommand() @@ -94,7 +92,7 @@ class SOAPCommand m_printBuffer += msg; } - ACE_SV_Semaphore_Simple pendingCommands; + ACE_Semaphore pendingCommands; void setCommandSuccess(bool val) { diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 08237f6d1..567093626 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9487" + #define REVISION_NR "9488" #endif // __REVISION_NR_H__