[11053] Process all SQL requests upon SqlDelayThread object destroying which might have been added while thread was stopping.

Signed-off-by: Ambal <pogrebniak@gala.net>

src/shared/Database/SqlDelayThread.cpp

@@ -26,10 +26,8 @@ SqlDelayThread::SqlDelayThread(Database* db, SqlConnection* conn) : m_dbEngine(d
 
 SqlDelayThread::~SqlDelayThread()
 {
-    //empty SQL queue before exiting
+    //process all requests which might have been queued while thread was stopping
-    SqlOperation* s = NULL;
+    ProcessRequests();
-    while (m_sqlQueue.next(s))
-        delete s;
 }
 
 void SqlDelayThread::run()
@@ -49,12 +47,7 @@ void SqlDelayThread::run()
         // empty the queue before exiting
         ACE_Based::Thread::Sleep(loopSleepms);
 
-        SqlOperation* s = NULL;
+        ProcessRequests();
-        while (m_sqlQueue.next(s))
-        {
-            s->Execute(m_dbConnection);
-            delete s;
-        }
 
         if((loopCounter++) >= pingEveryLoop)
         {
@@ -72,3 +65,13 @@ void SqlDelayThread::Stop()
 {
     m_running = false;
 }
+
+void SqlDelayThread::ProcessRequests()
+{
+    SqlOperation* s = NULL;
+    while (m_sqlQueue.next(s))
+    {
+        s->Execute(m_dbConnection);
+        delete s;
+    }
+}

src/shared/Database/SqlDelayThread.h

@@ -38,6 +38,9 @@ class SqlDelayThread : public ACE_Based::Runnable
         SqlConnection * m_dbConnection;                     ///< Pointer to DB connection
         volatile bool m_running;
 
+        //process all enqueued requests
+        void ProcessRequests();
+
     public:
         SqlDelayThread(Database* db, SqlConnection* conn);
         ~SqlDelayThread();

src/shared/revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "11052"
+ #define REVISION_NR "11053"
 #endif // __REVISION_NR_H__