Skip to content

Commit 309b440

Browse files
committed
added ignore to EHorseCallbackInterrupted
1 parent ea1e2e9 commit 309b440

File tree

3 files changed

+7
-30
lines changed

3 files changed

+7
-30
lines changed

HandleException.dpk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ requires
3232
rtl;
3333

3434
contains
35-
Horse.HandleExcept in 'Src\Horse.HandleExcept.pas';
35+
Horse.HandleException in 'Src\Horse.HandleException.pas';
3636

3737
end.

HandleException.dproj

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,6 @@
1818
<CfgParent>Base</CfgParent>
1919
<Base>true</Base>
2020
</PropertyGroup>
21-
<PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''">
22-
<Base_iOSDevice32>true</Base_iOSDevice32>
23-
<CfgParent>Base</CfgParent>
24-
<Base>true</Base>
25-
</PropertyGroup>
26-
<PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''">
27-
<Base_iOSDevice64>true</Base_iOSDevice64>
28-
<CfgParent>Base</CfgParent>
29-
<Base>true</Base>
30-
</PropertyGroup>
31-
<PropertyGroup Condition="('$(Platform)'=='iOSSimulator' and '$(Base)'=='true') or '$(Base_iOSSimulator)'!=''">
32-
<Base_iOSSimulator>true</Base_iOSSimulator>
33-
<CfgParent>Base</CfgParent>
34-
<Base>true</Base>
35-
</PropertyGroup>
3621
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
3722
<Base_Win32>true</Base_Win32>
3823
<CfgParent>Base</CfgParent>
@@ -68,20 +53,12 @@
6853
<DCC_CBuilderOutput>All</DCC_CBuilderOutput>
6954
<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
7055
<SanitizedProjectName>HandleException</SanitizedProjectName>
71-
<DCC_UnitSearchPath>$(DCC_UnitSearchPath);modules\.dcp;modules\.dcu;modules;modules\horse\src</DCC_UnitSearchPath></PropertyGroup>
56+
<DCC_UnitSearchPath>$(DCC_UnitSearchPath);modules\.dcp;modules\.dcu;modules;modules\horse\src</DCC_UnitSearchPath>
57+
</PropertyGroup>
7258
<PropertyGroup Condition="'$(Base_Android)'!=''">
7359
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
7460
<EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar</EnabledSysJars>
7561
</PropertyGroup>
76-
<PropertyGroup Condition="'$(Base_iOSDevice32)'!=''">
77-
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
78-
</PropertyGroup>
79-
<PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
80-
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
81-
</PropertyGroup>
82-
<PropertyGroup Condition="'$(Base_iOSSimulator)'!=''">
83-
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
84-
</PropertyGroup>
8562
<PropertyGroup Condition="'$(Base_Win32)'!=''">
8663
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
8764
<BT_BuildType>Debug</BT_BuildType>
@@ -113,7 +90,7 @@
11390
<MainSource>MainSource</MainSource>
11491
</DelphiCompile>
11592
<DCCReference Include="rtl.dcp"/>
116-
<DCCReference Include="Src\Horse.HandleExcept.pas"/>
93+
<DCCReference Include="Src\Horse.HandleException.pas"/>
11794
<BuildConfiguration Include="Release">
11895
<Key>Cfg_2</Key>
11996
<CfgParent>Base</CfgParent>
@@ -785,9 +762,6 @@
785762
</Deployment>
786763
<Platforms>
787764
<Platform value="Android">False</Platform>
788-
<Platform value="iOSDevice32">False</Platform>
789-
<Platform value="iOSDevice64">False</Platform>
790-
<Platform value="iOSSimulator">False</Platform>
791765
<Platform value="Linux64">False</Platform>
792766
<Platform value="Win32">True</Platform>
793767
<Platform value="Win64">False</Platform>

Src/Horse.HandleException.pas

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ procedure HandleException(Req: THorseRequest; Res: THorseResponse; Next: TProc);
1919
try
2020
Next();
2121
except
22+
on E: EHorseCallbackInterrupted do
23+
raise;
24+
2225
on E: Exception do
2326
begin
2427
LJSON := TJSONObject.Create;

0 commit comments

Comments
 (0)