7 files changed, 12 insertions, 17 deletions
diff --git a/src/server/shared/Configuration/Config.cpp b/src/server/shared/Configuration/Config.cpp
index 5cd7ef52f82..ecebf30182e 100644
--- a/src/server/shared/Configuration/Config.cpp
+++ b/src/server/shared/Configuration/Config.cpp
@@ -103,6 +103,6 @@ std::list<std::string> ConfigMgr::GetKeysByString(std::string const& name)
     for (const ptree::value_type& child : _config)
         if (child.first.compare(0, name.length(), name) == 0)
             keys.push_back(child.first);
-   
+
     return keys;
 }
diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h
index f0b540022da..a1ee6407fea 100644
--- a/src/server/shared/Database/DatabaseWorkerPool.h
+++ b/src/server/shared/Database/DatabaseWorkerPool.h
@@ -59,6 +59,11 @@ class DatabaseWorkerPool
 
         ~DatabaseWorkerPool()
         {
+            _queue->Cancel();
+
+            delete _queue;
+
+            delete _connectionInfo;
         }
 
         bool Open(const std::string& infoString, uint8 async_threads, uint8 synch_threads)
@@ -122,12 +127,7 @@ class DatabaseWorkerPool
             for (uint8 i = 0; i < _connectionCount[IDX_SYNCH]; ++i)
                 _connections[IDX_SYNCH][i]->Close();
 
-            delete _queue;
-
             TC_LOG_INFO("sql.driver", "All connections on DatabasePool '%s' closed.", GetDatabaseName());
-
-            delete _connectionInfo;
-            _connectionInfo = NULL;
         }
 
         /**
diff --git a/src/server/shared/Database/PreparedStatement.cpp b/src/server/shared/Database/PreparedStatement.cpp
index fb1bfa687d0..23c50ac2ef8 100644
--- a/src/server/shared/Database/PreparedStatement.cpp
+++ b/src/server/shared/Database/PreparedStatement.cpp
@@ -446,8 +446,8 @@ std::string MySQLPreparedStatement::getQueryString(std::string const& sqlPattern
 
 //- Execution
 PreparedStatementTask::PreparedStatementTask(PreparedStatement* stmt, bool async) :
-m_stmt(stmt)
-{ 
+m_stmt(stmt), m_result(nullptr)
+{
     m_has_result = async; // If it's async, then there's a result
     if (async)
         m_result = new PreparedQueryResultPromise();
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index 65cf930a634..a7b6b418cc4 100644
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -278,7 +278,7 @@ void Log::write(LogMessage* msg) const
         auto logOperation = std::shared_ptr<LogOperation>(new LogOperation(logger, msg));
 
         _ioService->post(_strand->wrap([logOperation](){ logOperation->call(); }));
-       
+
     }
     else
     {
diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h
index 8ae8db5bf5f..78e7e012bbe 100644
--- a/src/server/shared/Logging/Log.h
+++ b/src/server/shared/Logging/Log.h
@@ -50,7 +50,7 @@ class Log
                 instance._ioService = ioService;
                 instance._strand = new boost::asio::strand(*ioService);
             }
-            
+
             return &instance;
         }
 
diff --git a/src/server/shared/Threading/ProducerConsumerQueue.h b/src/server/shared/Threading/ProducerConsumerQueue.h
index 3fefd27ba6e..98a0188b6b5 100644
--- a/src/server/shared/Threading/ProducerConsumerQueue.h
+++ b/src/server/shared/Threading/ProducerConsumerQueue.h
@@ -76,7 +76,7 @@ public:
         {
             _condition.wait(lock);
         }
-        
+
         if (_queue.empty())
             return;
 
@@ -106,6 +106,6 @@ public:
     }
 };
 
-#endif 
+#endif
 
 
diff --git a/src/server/shared/Utilities/ServiceWin32.cpp b/src/server/shared/Utilities/ServiceWin32.cpp
index f4a0339d9e6..ecf403423f7 100644
--- a/src/server/shared/Utilities/ServiceWin32.cpp
+++ b/src/server/shared/Utilities/ServiceWin32.cpp
@@ -24,11 +24,6 @@
 #include <windows.h>
 #include <winsvc.h>
 
-// stupid ACE define
-#ifdef main
-#undef main
-#endif //main
-
 #if !defined(WINADVAPI)
 #if !defined(_ADVAPI32_)
 #define WINADVAPI DECLSPEC_IMPORT