aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/server/shared/Database/DatabaseWorker.cpp15
-rwxr-xr-xsrc/server/shared/Database/DatabaseWorker.h3
2 files changed, 1 insertions, 17 deletions
diff --git a/src/server/shared/Database/DatabaseWorker.cpp b/src/server/shared/Database/DatabaseWorker.cpp
index 12eb886996b..248e3c20d12 100644
--- a/src/server/shared/Database/DatabaseWorker.cpp
+++ b/src/server/shared/Database/DatabaseWorker.cpp
@@ -50,18 +50,3 @@ int DatabaseWorker::svc()
m_conn->Close();
return 0;
}
-
-int DatabaseWorker::activate()
-{
- /* THR_DETACHED:
- Create an asynchronous thread. The exit status of the thread would not be available to any other threads.
- The thread resources are reclaimed by the operating system whenever the thread is terminated. */
-
- /* THR_NEW_LWP:
- Create an explicit kernel-level thread (as opposed to a user-level thread). */
-
- ACE_Task_Base::activate(THR_NEW_LWP | THR_DETACHED, 1);
- return 0; //^ - Spawn one thread to handle this task.
- // However more of these tasks may be activated
- // See DatabaseWorkerPool ctor.
-} \ No newline at end of file
diff --git a/src/server/shared/Database/DatabaseWorker.h b/src/server/shared/Database/DatabaseWorker.h
index 27ff17acc11..f2249fa750c 100755
--- a/src/server/shared/Database/DatabaseWorker.h
+++ b/src/server/shared/Database/DatabaseWorker.h
@@ -23,14 +23,13 @@
class MySQLConnection;
-class DatabaseWorker : public ACE_Task_Base
+class DatabaseWorker : protected ACE_Task_Base
{
public:
DatabaseWorker(ACE_Activation_Queue* new_queue, MySQLConnection* con);
///- Inherited from ACE_Task_Base
int svc();
- int activate();
int wait() { return ACE_Task_Base::wait(); }
private: