Skip to content

Hotfix #722

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

Merged
merged 2 commits into from
May 8, 2020
Merged

Hotfix #722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d5bc99
Fixed: stackTrace:null in output when options.IncludeExceptionStackTr…
Apr 13, 2020
fef483d
Fixed: crash when using obfuscated IDs
Apr 13, 2020
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
11 changes: 9 additions & 2 deletions src/JsonApiDotNetCore/Models/JsonApiDocuments/ErrorMeta.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,15 @@ public sealed class ErrorMeta

public void IncludeExceptionStackTrace(Exception exception)
{
Data["StackTrace"] = exception?.Demystify().ToString()
.Split(new[] {"\n"}, int.MaxValue, StringSplitOptions.RemoveEmptyEntries);
if (exception == null)
{
Data.Remove("StackTrace");
}
else
{
Data["StackTrace"] = exception.Demystify().ToString()
.Split(new[] { "\n" }, int.MaxValue, StringSplitOptions.RemoveEmptyEntries);
}
}
}
}
2 changes: 1 addition & 1 deletion src/JsonApiDotNetCore/Services/DefaultResourceService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ public virtual async Task<TResource> UpdateAsync(TId id, TResource requestEntity
}

_repository.FlushFromCache(databaseEntity);
TResource afterEntity = await _repository.Get(databaseEntity.Id).FirstOrDefaultAsync();
TResource afterEntity = await _repository.Get(id).FirstOrDefaultAsync();
_resourceChangeTracker.SetFinallyStoredAttributeValues(afterEntity);

bool hasImplicitChanges = _resourceChangeTracker.HasImplicitChanges();
Expand Down