diff options
author | Machiavelli <machiavelli.trinity@gmail.com> | 2011-01-13 20:28:40 +0100 |
---|---|---|
committer | Machiavelli <machiavelli.trinity@gmail.com> | 2011-01-13 20:28:40 +0100 |
commit | 4c15ebe09d51d22d98e314302652b66f345a56ff (patch) | |
tree | c53656bbb274261f98fc229e310a1097562edbb5 /src | |
parent | cf9250c29f4e66f6a8fe6d14ace798a4252ce59b (diff) |
Core/DBLayer: Properly deallocate SQLOperation objects from Databaseworkerpool queue.
Diffstat (limited to 'src')
-rwxr-xr-x | src/server/shared/Database/DatabaseWorkerPool.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h index 957d93d449b..6c1be4c5a42 100755 --- a/src/server/shared/Database/DatabaseWorkerPool.h +++ b/src/server/shared/Database/DatabaseWorkerPool.h @@ -102,10 +102,8 @@ class DatabaseWorkerPool { sLog->outSQLDriver("Closing down databasepool '%s'.", m_connectionInfo.database.c_str()); - /// Shuts down delaythreads for this connection pool. - m_queue->queue()->deactivate(); - while (SQLOperation* op = (SQLOperation*)(m_queue->dequeue())) - delete op; + /// Shuts down delaythreads for this connection pool by underlying deactivate() + m_queue->queue()->close(); for (uint8 i = 0; i < m_connectionCount[IDX_ASYNC]; ++i) { |