From 0e8042141d03e30f0905ffc6934df1a741b5f4d5 Mon Sep 17 00:00:00 2001 From: michael Date: Sat, 1 May 2021 08:52:56 +0000 Subject: [PATCH] * Merging revisions r49197 from trunk: ------------------------------------------------------------------------ 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 - --- packages/fcl-web/src/restbridge/sqldbrestbridge.pp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/fcl-web/src/restbridge/sqldbrestbridge.pp b/packages/fcl-web/src/restbridge/sqldbrestbridge.pp index bcc8775b4e..69f8e0942e 100644 --- a/packages/fcl-web/src/restbridge/sqldbrestbridge.pp +++ b/packages/fcl-web/src/restbridge/sqldbrestbridge.pp @@ -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;