Skip to content

Added some fixes #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fperana wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added some fixes #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2adb8cc
Fixed type mismatch between declaration and implementation
fperana Feb 16, 2026
ee79fff
Fixed memory leak
fperana Feb 16, 2026
f5b54ac
Fixed double occurrence of "exception" element
fperana Feb 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Source/Core/WiRL.Core.Exceptions.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,10 @@ constructor EWiRLWebApplicationException.Create(const AMessage: string; AStatus:
Create(AMessage, AStatus);

if Assigned(AData) then
begin
FData.Free;
FData := (AData.Clone as TJSONObject);
end;
end;

constructor EWiRLWebApplicationException.Create(AInnerException: Exception;
Expand Down
4 changes: 3 additions & 1 deletion Source/Core/WiRL.Core.MessageBody.Default.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,9 @@ procedure TWiRLExceptionWriter.WriteTo(const AValue: TValue; const AAttributes:
LErr := AValue.AsObject as Exception;
LJSON := TNeon.ObjectToJSON(LErr, LConfig);
try
(LJSON as TJSONObject).AddPair('exception', LErr.ClassName);
// Don't add 'exception' pair for EWiRLWebApplicationException (already has its own Exception property)
if not (LErr is EWiRLWebApplicationException) then
(LJSON as TJSONObject).AddPair('exception', LErr.ClassName);
if FWiRLConfigErrors.ErrorDebugInfo then
begin
// Using TNeonCase algorithm
Expand Down
2 changes: 1 addition & 1 deletion Source/IDE Wizard/WiRL.Wizards.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ function TWiRLResourceModuleWizard.GetGalleryCategory: IOTAGalleryCategory;
Result := (BorlandIDEServices as IOTAGalleryCategoryManager).FindCategory(SIDString);
end;

function TWiRLResourceModuleWizard.GetGlyph: Cardinal;
function TWiRLResourceModuleWizard.GetGlyph: {$IFDEF WIN32}Cardinal{$ELSE}UInt64{$ENDIF};
begin
{ TODO : function TWiRLServeProjectWizard.GetGlyph: Cardinal; }
Result := LoadIcon(HInstance, 'WiRLServerWizardIcon');
Expand Down