aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMachiavelli <none@none>2010-08-19 16:41:43 +0200
committerMachiavelli <none@none>2010-08-19 16:41:43 +0200
commit17d0382cd473f465d7dec6d894dbea377979f201 (patch)
treec4bc77ebc15c5a72bf63c32c69b19a50347e028e /src
parent46438f9f92c52deef2c6f0ed35402885127eeeb7 (diff)
Fix a crash in transaction commands.
Fixes issue #3495 --HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/server/shared/Database/DatabaseWorkerPool.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/shared/Database/DatabaseWorkerPool.cpp b/src/server/shared/Database/DatabaseWorkerPool.cpp
index cbccf529c75..469f6375310 100644
--- a/src/server/shared/Database/DatabaseWorkerPool.cpp
+++ b/src/server/shared/Database/DatabaseWorkerPool.cpp
@@ -205,6 +205,7 @@ void DatabaseWorkerPool::RollbackTransaction()
{
itr->second->ForcefulDelete();
delete itr->second;
+ itr->second = NULL;
}
}
@@ -216,7 +217,7 @@ void DatabaseWorkerPool::CommitTransaction()
if (itr != m_tranQueues.end() && itr->second != NULL)
{
Enqueue(itr->second);
- m_tranQueues.erase(itr);
+ itr->second = NULL;
}
}