incoming_message_dispatcher.rb in ably-1.0.6

- old
+ new

@@ -54,10 +54,11 @@
             return
           end
         end
 
         update_connection_recovery_info protocol_message
+        connection.set_connection_confirmed_alive
 
         case protocol_message.action
           when ACTION.Heartbeat
           when ACTION.Ack
             ack_pending_queue_for_message_serial(protocol_message) if protocol_message.has_message_serial?
@@ -73,12 +74,14 @@
             elsif connection.disconnected? || connection.closing? || connection.closed? || connection.failed?
               logger.warn { "Out-of-order incoming CONNECTED ProtocolMessage discarded as connection has moved on and is in state: #{connection.state}" }
             elsif connection.connected?
               logger.debug { "Updated CONNECTED ProtocolMessage received (whilst connected)" }
               process_connected_update_message protocol_message
+              connection.set_connection_confirmed_alive # Connection protocol messages can change liveness settings such as max_idle_interval
             else
               process_connected_message protocol_message
+              connection.set_connection_confirmed_alive # Connection protocol messages can change liveness settings such as max_idle_interval
             end
 
           when ACTION.Disconnect, ACTION.Disconnected
             connection.transition_state_machine :disconnected, reason: protocol_message.error unless connection.disconnected?
 
@@ -130,11 +133,9 @@
 
           else
             error = Ably::Exceptions::ProtocolError.new("Protocol Message Action #{protocol_message.action} is unsupported by this MessageDispatcher", 400, 80013)
             logger.fatal error.message
         end
-
-        connection.set_connection_confirmed_alive
       end
 
       def dispatch_channel_error(protocol_message)
         logger.warn { "Channel Error message received: #{protocol_message.error}" }
         if !protocol_message.has_message_serial?