merge bug19384 into default

Author: Matthias Radestock

src/client/impl/ConnectionBase.cs

@@ -539,13 +539,12 @@ public void HeartbeatReadLoop()
             FinishClose();
         }
 
-        public void HandleHeartbeatFrame()
+        public void NotifyHeartbeatThread()
         {
             if (m_heartbeat == 0) {
                 // Heartbeating not enabled for this connection.
                 return;
             }
-            
             m_heartbeatRead.Set();
         }
 
@@ -601,11 +600,11 @@ public void MainLoopIteration()
         {
             Frame frame = m_frameHandler.ReadFrame();
 
+            NotifyHeartbeatThread();
             // We have received an actual frame.
             if (frame.Type == CommonFraming.Constants.FrameHeartbeat) {
                 // Ignore it: we've already just reset the heartbeat
                 // counter.
-                HandleHeartbeatFrame();
                 return;
             }