Bug fix

viniciussanchez · Jun 19, 2024 · 5f65b39 · 5f65b39
1 parent e5594be
commit 5f65b39
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 5 deletions.
diff --git a/src/RESTRequest4D.Request.Client.pas b/src/RESTRequest4D.Request.Client.pas
@@ -317,7 +317,6 @@ constructor TRequestClient.Create;
   FRESTRequest.SynchronizedEvents := False;
   FParams := TStringList.Create;
   FHeaders := TStringList.Create;
-  FResponse := TResponseClient.Create(FRESTResponse);
   FRESTRequest.OnAfterExecute := DoAfterExecute;
   FRESTRequest.OnHTTPProtocolError := DoHTTPProtocolError;
   DoJoinComponents;
@@ -336,6 +335,7 @@ function TRequestClient.DeactivateProxy: IRequest;
 
 function TRequestClient.Delete: IResponse;
 begin
+  FResponse := TResponseClient.Create(FRESTResponse);
   Result := FResponse;
   DoBeforeExecute(FRESTRequest);
   FRESTRequest.Method := TRESTRequestMethod.rmDELETE;
@@ -403,6 +403,7 @@ procedure TRequestClient.ExecuteRequest;
 
 function TRequestClient.Get: IResponse;
 begin
+  FResponse := TResponseClient.Create(FRESTResponse);
   Result := FResponse;
   DoBeforeExecute(FRESTRequest);
   FRESTRequest.Method := TRESTRequestMethod.rmGET;
@@ -491,6 +492,7 @@ function TRequestClient.Timeout: Integer;
 
 function TRequestClient.Patch: IResponse;
 begin
+  FResponse := TResponseClient.Create(FRESTResponse);
   Result := FResponse;
   DoBeforeExecute(FRESTRequest);
   FRESTRequest.Method := TRESTRequestMethod.rmPATCH;
@@ -499,6 +501,7 @@ function TRequestClient.Patch: IResponse;
 
 function TRequestClient.Post: IResponse;
 begin
+  FResponse := TResponseClient.Create(FRESTResponse);
   Result := FResponse;
   DoBeforeExecute(FRESTRequest);
   FRESTRequest.Method := TRESTRequestMethod.rmPOST;
@@ -536,6 +539,7 @@ function TRequestClient.Proxy(const AServer, APassword, AUsername: string; const
 
 function TRequestClient.Put: IResponse;
 begin
+  FResponse := TResponseClient.Create(FRESTResponse);
   Result := FResponse;
   DoBeforeExecute(FRESTRequest);
   FRESTRequest.Method := TRESTRequestMethod.rmPUT;

diff --git a/src/RESTRequest4D.Request.FPHTTPClient.pas b/src/RESTRequest4D.Request.FPHTTPClient.pas
@@ -329,30 +329,35 @@ function TRequestFPHTTPClient.OnAfterExecute(const AOnAfterExecute: TRR4DCallbac
 
 function TRequestFPHTTPClient.Get: IResponse;
 begin
+  FResponse := TResponseFpHTTPClient.Create(FFPHTTPClient);
   Result := FResponse;
   ExecuteRequest(mrGET);
 end;
 
 function TRequestFPHTTPClient.Post: IResponse;
 begin
+  FResponse := TResponseFpHTTPClient.Create(FFPHTTPClient);
   Result := FResponse;
   ExecuteRequest(mrPOST);
 end;
 
 function TRequestFPHTTPClient.Put: IResponse;
 begin
+  FResponse := TResponseFpHTTPClient.Create(FFPHTTPClient);
   Result := FResponse;
   ExecuteRequest(mrPUT);
 end;
 
 function TRequestFPHTTPClient.Delete: IResponse;
 begin
+  FResponse := TResponseFpHTTPClient.Create(FFPHTTPClient);
   Result := FResponse;
   ExecuteRequest(mrDELETE);
 end;
 
 function TRequestFPHTTPClient.Patch: IResponse;
 begin
+  FResponse := TResponseFpHTTPClient.Create(FFPHTTPClient);
   Result := FResponse;
   ExecuteRequest(mrPATCH);
 end;
@@ -641,7 +646,6 @@ constructor TRequestFPHTTPClient.Create;
   FFPHTTPClient.ResponseHeaders.Clear;
 
   FHeaders := TstringList.Create;
-  FResponse := TResponseFpHTTPClient.Create(FFPHTTPClient);
   FParams := TstringList.Create;
   FFields := TDictionary<string, string>.Create;;
   FUrlSegments := TstringList.Create;

diff --git a/src/RESTRequest4D.Request.ICS.pas b/src/RESTRequest4D.Request.ICS.pas
@@ -162,18 +162,21 @@ function TRequestICS.RaiseExceptionOn500(const ARaiseException: Boolean): IReque
 
 function TRequestICS.Patch: IResponse;
 begin
+  FResponse := TResponseICS.Create(FSslHttpRest);
   Result := FResponse;
   ExecuteRequest(mrPATCH);
 end;
 
 function TRequestICS.Put: IResponse;
 begin
+  FResponse := TResponseICS.Create(FSslHttpRest);
   Result := FResponse;
   ExecuteRequest(mrPUT);
 end;
 
 function TRequestICS.Post: IResponse;
 begin
+  FResponse := TResponseICS.Create(FSslHttpRest);
   Result := FResponse;
   ExecuteRequest(mrPOST);
 end;
@@ -189,6 +192,7 @@ function TRequestICS.Proxy(const AServer, APassword, AUsername: string; const AP
 
 function TRequestICS.Get: IResponse;
 begin
+  FResponse := TResponseICS.Create(FSslHttpRest);
   Result := FResponse;
   ExecuteRequest(mrGET);
 end;
@@ -209,6 +213,7 @@ function TRequestICS.DeactivateProxy: IRequest;
 
 function TRequestICS.Delete: IResponse;
 begin
+  FResponse := TResponseICS.Create(FSslHttpRest);
   Result := FResponse;
   ExecuteRequest(mrDELETE);
 end;
@@ -427,7 +432,6 @@ constructor TRequestICS.Create;
   FBodyRaw := TStringList.Create;
   FUrlSegments := TStringList.Create;
   FBodyRaw.LineBreak := '';
-  FResponse := TResponseICS.Create(FSslHttpRest);
 end;
 
 destructor TRequestICS.Destroy;

diff --git a/src/RESTRequest4D.Request.Indy.pas b/src/RESTRequest4D.Request.Indy.pas
@@ -286,18 +286,21 @@ procedure TRequestIndy.ExecuteRequest(const AMethod: TMethodRequest);
 
 function TRequestIndy.Patch: IResponse;
 begin
+  FResponse := TResponseIndy.Create(FIdHTTP);
   Result := FResponse;
   ExecuteRequest(mrPATCH);
 end;
 
 function TRequestIndy.Put: IResponse;
 begin
+  FResponse := TResponseIndy.Create(FIdHTTP);
   Result := FResponse;
   ExecuteRequest(mrPUT);
 end;
 
 function TRequestIndy.Post: IResponse;
 begin
+  FResponse := TResponseIndy.Create(FIdHTTP);
   Result := FResponse;
   ExecuteRequest(mrPOST);
 end;
@@ -313,6 +316,7 @@ function TRequestIndy.Proxy(const AServer, APassword, AUsername: string; const A
 
 function TRequestIndy.Get: IResponse;
 begin
+  FResponse := TResponseIndy.Create(FIdHTTP);
   Result := FResponse;
   ExecuteRequest(mrGET);
 end;
@@ -346,6 +350,7 @@ function TRequestIndy.KeyFile(const APath: string): IRequest;
 
 function TRequestIndy.Delete: IResponse;
 begin
+  FResponse := TResponseIndy.Create(FIdHTTP);
   Result := FResponse;
   ExecuteRequest(mrDELETE);
 end;
@@ -629,7 +634,6 @@ constructor TRequestIndy.Create;
   FIdSSLIOHandlerSocketOpenSSL.OnStatusInfoEx := Self.OnStatusInfoEx;
 
   FHeaders := TStringList.Create;
-  FResponse := TResponseIndy.Create(FIdHTTP);
   FParams := TStringList.Create;
   FUrlSegments := TStringList.Create;
 

diff --git a/src/RESTRequest4D.Request.Synapse.pas b/src/RESTRequest4D.Request.Synapse.pas
@@ -342,6 +342,7 @@ function TRequestSynapse.OnAfterExecute(const AOnAfterExecute: TRR4DCallbackOnAf
 
 function TRequestSynapse.Get: IResponse;
 begin
+  FResponse := TResponseSynapse.Create(FHTTPSend);
   Result := FResponse;
   ExecuteRequest(mrGET);
 end;
@@ -354,24 +355,28 @@ function TRequestSynapse.KeyFile(const APath: string): IRequest;
 
 function TRequestSynapse.Post: IResponse;
 begin
+  FResponse := TResponseSynapse.Create(FHTTPSend);
   Result := FResponse;
   ExecuteRequest(mrPOST);
 end;
 
 function TRequestSynapse.Put: IResponse;
 begin
+  FResponse := TResponseSynapse.Create(FHTTPSend);
   Result := FResponse;
   ExecuteRequest(mrPUT);
 end;
 
 function TRequestSynapse.Delete: IResponse;
 begin
+  FResponse := TResponseSynapse.Create(FHTTPSend);
   Result := FResponse;
   ExecuteRequest(mrDELETE);
 end;
 
 function TRequestSynapse.Patch: IResponse;
 begin
+  FResponse := TResponseSynapse.Create(FHTTPSend);
   Result := FResponse;
   ExecuteRequest(mrPATCH);
 end;
@@ -704,7 +709,6 @@ constructor TRequestSynapse.Create;
   FHTTPSend.Headers.NameValueSeparator := ':';
 
   FHeaders := TstringList.Create;
-  FResponse := TResponseSynapse.Create(FHTTPSend);
   FParams := TstringList.Create;
   FFields := TDictionary<string, string>.Create;;
   FUrlSegments := TstringList.Create;

diff --git a/src/RESTRequest4D.Response.NetHTTP.pas b/src/RESTRequest4D.Response.NetHTTP.pas
@@ -147,6 +147,11 @@ procedure TResponseNetHTTP.SetContent(const AContent: TStringStream);
 
 procedure TResponseNetHTTP.SetHTTPResponse(const AHTTPResponse: IHTTPResponse);
 begin
+  if Assigned(FJSONValue) then
+  begin
+    FJSONValue.Free;
+    FJSONValue := nil;
+  end;
   FHTTPResponse := AHTTPResponse;
 end;