svn commit: r751838 - in /activemq/activemq-cpp/trunk/src/main/activemq/transport/failover: FailoverTransport.cpp FailoverTransport.h

[tabish]

Author: tabish
Date: Mon Mar  9 21:08:50 2009
New Revision: 751838

URL: http://svn.apache.org/viewvc?rev=751838&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQCPP-100

Temporary fix for shutdown bug, patches the code until a better solution is 
implemented.

Modified:
    
activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/FailoverTransport.cpp
    
activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/FailoverTransport.h

Modified: 
activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/FailoverTransport.cpp
URL: 
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/FailoverTransport.cpp?rev=751838&r1=751837&r2=751838&view=diff
==============================================================================
--- 
activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/FailoverTransport.cpp
 (original)
+++ 
activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/FailoverTransport.cpp
 Mon Mar  9 21:08:50 2009
@@ -53,7 +53,6 @@
     this->maxReconnectAttempts = 0;
     this->connectFailures = 0;
     this->reconnectDelay = this->initialReconnectDelay;
-    this->firstConnection = true;
     this->backup = false;
     this->backupPoolSize = 1;
     this->trackMessages = false;
@@ -400,7 +399,7 @@
         sleepMutex.notifyAll();
     }
 
-    reconnectTask->shutdown();
+    reconnectTask->shutdown( 500 );
 
     if( transportToStop != NULL ) {
         transportToStop->close();
@@ -566,10 +565,6 @@
                             transportListener->transportResumed();
                         }
 
-                        if( firstConnection ) {
-                            firstConnection = false;
-                        }
-
                         connected = true;
                         return false;
                     } catch( Exception& e ) {

Modified: 
activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/FailoverTransport.h
URL: 
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/FailoverTransport.h?rev=751838&r1=751837&r2=751838&view=diff
==============================================================================
--- 
activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/FailoverTransport.h
 (original)
+++ 
activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/FailoverTransport.h
 Mon Mar  9 21:08:50 2009
@@ -68,7 +68,6 @@
         int maxReconnectAttempts;
         int connectFailures;
         long long reconnectDelay;
-        bool firstConnection;
         bool backup;
         int backupPoolSize;
         bool trackMessages;