Do not free the MQTT socket when reconnecting after an error

witsa · Dec 8, 2016 · 9b24fb7 · 9b24fb7
1 parent 0b6d56b
commit 9b24fb7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/TMQTTClient/MQTT.pas b/TMQTTClient/MQTT.pas
@@ -258,6 +258,7 @@       TMQTTClient = class(TObject)
         var 
           Data: TBytes;
         begin
+          writeln('TMQTTClient.Disconnect');
           Result := False;
 
           SetLength(Data, 2);
@@ -269,7 +270,7 @@       TMQTTClient = class(TObject)
               FReadThread.waitFor;
               FSocket.CloseSocket;
               FisConnected := False;
-              FSocket.Free;
+              FSocket := nil;
             end
           else Result := False;
         end;
@@ -283,6 +284,7 @@       TMQTTClient = class(TObject)
 ------------------------------------------------------------------------------*}
         procedure TMQTTClient.ForceDisconnect;
         begin
+          writeln('TMQTTClient.ForceDisconnect');
           if FReadThread <> nil then
             begin
               FReadThread.Terminate;
@@ -291,7 +293,6 @@       TMQTTClient = class(TObject)
           if FSocket <> nil then
             begin
               FSocket.CloseSocket;
-              FSocket.Free;
               FSocket := nil;
             end;
           FisConnected := False;

diff --git a/TMQTTClient/MQTTReadThread.pas b/TMQTTClient/MQTTReadThread.pas
@@ -189,6 +189,7 @@   TMQTTReadThread = class(TThread)
                                multiplier := 1;
                                remainingLengthx := 0;
                                CurrentMessage.Data := nil;
+
                                CurrentMessage.FixedHeader := FPSocket^.RecvByte(1000);
                                if (FPSocket^.LastError = ESysETIMEDOUT) then continue;
                                if (FPSocket^.LastError <> 0) then