activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1447852 - /activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/failover/FailoverTransport.cpp
Date Tue, 19 Feb 2013 17:51:13 GMT
Author: tabish
Date: Tue Feb 19 17:51:13 2013
New Revision: 1447852

URL: http://svn.apache.org/r1447852
Log:
Avoid Windows name clash

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

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/failover/FailoverTransport.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/failover/FailoverTransport.cpp?rev=1447852&r1=1447851&r2=1447852&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/failover/FailoverTransport.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/failover/FailoverTransport.cpp
Tue Feb 19 17:51:13 2013
@@ -65,7 +65,7 @@ namespace failover {
         FailoverTransportImpl& operator= (const FailoverTransportImpl&);
 
         static const int DEFAULT_INITIAL_RECONNECT_DELAY;
-        static const int INFINITE;
+        static const int INFINITE_WAIT;
 
     public:
 
@@ -121,14 +121,14 @@ namespace failover {
             closed(false),
             connected(false),
             started(false),
-            timeout(INFINITE),
+            timeout(INFINITE_WAIT),
             initialReconnectDelay(DEFAULT_INITIAL_RECONNECT_DELAY),
             maxReconnectDelay(1000*30),
             backOffMultiplier(2),
             useExponentialBackOff(true),
             initialized(false),
-            maxReconnectAttempts(INFINITE),
-            startupMaxReconnectAttempts(INFINITE),
+            maxReconnectAttempts(INFINITE_WAIT),
+            startupMaxReconnectAttempts(INFINITE_WAIT),
             connectFailures(0),
             reconnectDelay(DEFAULT_INITIAL_RECONNECT_DELAY),
             trackMessages(false),
@@ -204,7 +204,7 @@ namespace failover {
 
         int calculateReconnectAttemptLimit() const {
             int maxReconnectValue = maxReconnectAttempts;
-            if (firstConnection && startupMaxReconnectAttempts != INFINITE) {
+            if (firstConnection && startupMaxReconnectAttempts != INFINITE_WAIT)
{
                 maxReconnectValue = startupMaxReconnectAttempts;
             }
             return maxReconnectValue;
@@ -273,7 +273,7 @@ namespace failover {
     };
 
     const int FailoverTransportImpl::DEFAULT_INITIAL_RECONNECT_DELAY = 10;
-    const int FailoverTransportImpl::INFINITE = -1;
+    const int FailoverTransportImpl::INFINITE_WAIT = -1;
 
 }}}
 



Mime
View raw message