DB IDO: Reset reconnect timer before pausing the connection

refs #6414

diff --git a/components/db_ido_mysql/idomysqlconnection.cpp b/components/db_ido_mysql/idomysqlconnection.cpp
index 54955cb22f6f90d96e6eed894db92ab59f44ec57..c37058e11d08171e89c4ce5ee6faa32ed474df60 100644 (file)
--- a/components/db_ido_mysql/idomysqlconnection.cpp
+++ b/components/db_ido_mysql/idomysqlconnection.cpp
@@ -84,10 +84,10 @@ void IdoMysqlConnection::Resume(void)
 
 void IdoMysqlConnection::Pause(void)
 {
-       DbConnection::Pause();
-
        m_ReconnectTimer.reset();
 
+       DbConnection::Pause();
+
        m_QueryQueue.Enqueue(boost::bind(&IdoMysqlConnection::Disconnect, this));
        m_QueryQueue.Join();
 }

diff --git a/components/db_ido_pgsql/idopgsqlconnection.cpp b/components/db_ido_pgsql/idopgsqlconnection.cpp
index c27e4659f2c21ebc4c827eb07ca1361e9f356b47..fa63eb3c427ac91464ceff7a921d31308d306b5f 100644 (file)
--- a/components/db_ido_pgsql/idopgsqlconnection.cpp
+++ b/components/db_ido_pgsql/idopgsqlconnection.cpp
@@ -86,10 +86,10 @@ void IdoPgsqlConnection::Resume(void)
 
 void IdoPgsqlConnection::Pause(void)
 {
-       DbConnection::Pause();
-
        m_ReconnectTimer.reset();
 
+       DbConnection::Pause();
+
        m_QueryQueue.Enqueue(boost::bind(&IdoPgsqlConnection::Disconnect, this));
        m_QueryQueue.Join();
 }