Merge pull request #386 from Fresa/master

incorrect retrieval of milliseconds for timeout

Author: lukebakken

projects/client/RabbitMQ.Client/src/client/impl/Connection.cs

@@ -1018,8 +1018,8 @@ public void MaybeStartHeartbeatTimers()
                 _heartbeatWriteTimer.Change(200, (int)m_heartbeatTimeSpan.TotalMilliseconds);
                 _heartbeatReadTimer.Change(200, (int)m_heartbeatTimeSpan.TotalMilliseconds);
 #else
-                _heartbeatWriteTimer = new Timer(HeartbeatWriteTimerCallback, null, 200, m_heartbeatTimeSpan.Milliseconds);
-                _heartbeatReadTimer = new Timer(HeartbeatReadTimerCallback, null, 200, m_heartbeatTimeSpan.Milliseconds);
+                _heartbeatWriteTimer = new Timer(HeartbeatWriteTimerCallback, null, 200, (int)m_heartbeatTimeSpan.TotalMilliseconds);
+                _heartbeatReadTimer = new Timer(HeartbeatReadTimerCallback, null, 200, (int)m_heartbeatTimeSpan.TotalMilliseconds);
                 _heartbeatWriteTimer.Change(TimeSpan.FromMilliseconds(200), m_heartbeatTimeSpan);
                 _heartbeatReadTimer.Change(TimeSpan.FromMilliseconds(200), m_heartbeatTimeSpan);
 #endif
@@ -1077,7 +1077,7 @@ public void HeartbeatReadTimerCallback(object state)
                     TerminateMainloop();
                     FinishClose();
                 }
-                else if(_heartbeatReadTimer != null)
+                else if (_heartbeatReadTimer != null)
                 {
                     _heartbeatReadTimer.Change(Heartbeat * 1000, Timeout.Infinite);
                 }
@@ -1151,7 +1151,7 @@ private void MaybeDisposeTimer(ref Timer timer)
                 {
                     // we are shutting down, ignore
                 }
-                catch(NullReferenceException)
+                catch (NullReferenceException)
                 {
                     // this should be very rare but could occur from a race condition
                 }
@@ -1281,7 +1281,7 @@ protected void StartAndTune()
             var connectionStartCell = new BlockingCell();
             m_model0.m_connectionStartCell = connectionStartCell;
             m_model0.HandshakeContinuationTimeout = m_factory.HandshakeContinuationTimeout;
-            m_frameHandler.ReadTimeout = m_factory.HandshakeContinuationTimeout.Milliseconds;
+            m_frameHandler.ReadTimeout = (int)m_factory.HandshakeContinuationTimeout.TotalMilliseconds;
             m_frameHandler.SendHeader();
 
             var connectionStart = (ConnectionStartDetails)