paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-13 00:09:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Merging revisions r49197 from trunk:

Browse Source 
------------------------------------------------------------------------
    r49197 | michael | 2021-04-13 13:41:50 +0200 (Tue, 13 Apr 2021) | 1 line
    
    * Fix for double error
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@49302 -
This commit is contained in:
michael 2021-05-01 08:52:56 +00:00
parent 619c520fd6
commit 0e8042141d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/fcl-web/src/restbridge/sqldbrestbridge.pp
View File

@ -2019,8 +2019,9 @@ begin
end;
Finally
// Make sure there is a document in case of error
if (aResponse.ContentStream.Size=0) and Not ((aResponse.Code div 100)=2) then
IO.RESTOutput.CreateErrorContent(aResponse.Code,aResponse.CodeText);
// MVC: Disabled for the moment, we need more reliable detection of this. it adds error twice in case of exception.
// if (aResponse.ContentStream.Size=0) and Not ((aResponse.Code div 100)=2) then
// IO.RESTOutput.CreateErrorContent(aResponse.Code,aResponse.CodeText);
if Not ((IO.Operation in [roOptions,roHEAD]) or aResponse.ContentSent) then
IO.RestOutput.FinalizeOutput;
aResponse.ContentStream.Position:=0;