修正：回调中触发异常会再次触发回调的问题

interestingitems · Dec 17, 2023 · 01b5b76 · 01b5b76
1 parent c7ddf5e
commit 01b5b76
Showing 1 changed file with 24 additions and 6 deletions.
diff --git a/Net/Net.CrossHttpClient.pas b/Net/Net.CrossHttpClient.pas
@@ -1793,7 +1793,10 @@ procedure TCrossHttpClientResponse.ParseRecvData(const ABuf: Pointer;
         // 因为有可能响应完成的数据在超时后才到来, 这时候请求状态已经被置为超时
         // 不应该再触发完成回调
         if (LHttpConnection.RequestStatus = rsReponsding) then
+        try
           TriggerResponseSuccess;
+        except
+        end;
       end;
     end;
   except
@@ -1803,27 +1806,37 @@ procedure TCrossHttpClientResponse.ParseRecvData(const ABuf: Pointer;
 end;
 
 procedure TCrossHttpClientResponse.TriggerResponseFailed(const AStatusCode: Integer; const AStatusText: string);
+var
+  LCallback: TCrossHttpResponseProc;
 begin
   try
+    LCallback := FCallback;
+    FCallback := nil;
+
     _SetStatus(AStatusCode, AStatusText);
 
     FConnection._SetRequestStatus(rsRespondFailed);
     FConnection.Close;
 
-    if Assigned(FCallback) then
-      FCallback(FConnection.FResponse);
+    if Assigned(LCallback) then
+      LCallback(FConnection.FResponse);
   finally
     FConnection._EndRequest;
   end;
 end;
 
 procedure TCrossHttpClientResponse.TriggerResponseSuccess;
+var
+  LCallback: TCrossHttpResponseProc;
 begin
   try
+    LCallback := FCallback;
+    FCallback := nil;
+
     FConnection._SetRequestStatus(rsRespondSuccess);
 
-    if Assigned(FCallback) then
-      FCallback(FConnection.FResponse);
+    if Assigned(LCallback) then
+      LCallback(FConnection.FResponse);
 
     FConnection._SetRequestStatus(rsIdle);
     FConnection._UpdateWatch;
@@ -1940,16 +1953,21 @@ procedure TCrossHttpClientResponse.TriggerResponseDataEnd;
 end;
 
 procedure TCrossHttpClientResponse.TriggerResponseTimeout;
+var
+  LCallback: TCrossHttpResponseProc;
 begin
   try
+    LCallback := FCallback;
+    FCallback := nil;
+
     // 408 = Request Time-out
     _SetStatus(408);
 
     FConnection._SetRequestStatus(rsRespondTimeout);
     FConnection.Close;
 
-    if Assigned(FCallback) then
-      FCallback(FConnection.FResponse);
+    if Assigned(LCallback) then
+      LCallback(FConnection.FResponse);
   finally
     FConnection._EndRequest;
   end;