Merge branch 'master' of https://github.com/ckrey/MQTT-Client-Framework

novastone-media · Oct 28, 2015 · af8d1f5 · af8d1f5
2 parents 5861d2f + 4a0fbc1
commit af8d1f5
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/MQTTClient/MQTTClient/MQTTSessionManager.m b/MQTTClient/MQTTClient/MQTTSessionManager.m
@@ -197,6 +197,7 @@ - (void)connectTo:(NSString *)host
    securityPolicy:(MQTTSSLSecurityPolicy *)securityPolicy
      certificates:(NSArray *)certificates
 {
+    BOOL shouldReconnect = self.session != nil;
     if (!self.session ||
         ![host isEqualToString:self.host] ||
         port != self.port ||
@@ -255,7 +256,14 @@ - (void)connectTo:(NSString *)host
         self.reconnectTime = RECONNECT_TIMER;
         self.reconnectFlag = FALSE;
     }
-    [self connectToInternal];
+    if(shouldReconnect){
+        NSLog(@"MQTTSessionManager reconnecting");
+        [self disconnect];
+        [self reconnect];
+    }else{
+        NSLog(@"MQTTSessionManager connecting");
+        [self connectToInternal];
+    }
 }
 
 - (UInt16)sendData:(NSData *)data topic:(NSString *)topic qos:(MQTTQosLevel)qos retain:(BOOL)retainFlag