Skip to content

Commit 4766a14

Browse files
matt-bartholomewpictosTheCodeTraveler
authored
change to ResetValidationTokenSource to guard against a disposed validationTokenSource (CommunityToolkit#2344)
* change to ResetValidationTokenSource to guard against a disposed validationTokenSource * add .Dispose() after cancel() --------- Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> Co-authored-by: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
1 parent b01a18d commit 4766a14

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

src/CommunityToolkit.Maui/Behaviors/Validators/ValidationBehavior.shared.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,8 +419,16 @@ void UpdateStyle(in VisualElement view, bool isValid)
419419

420420
void ResetValidationTokenSource(CancellationTokenSource? newTokenSource)
421421
{
422-
validationTokenSource?.Cancel();
423-
validationTokenSource = newTokenSource;
422+
try
423+
{
424+
validationTokenSource?.Cancel();
425+
validationTokenSource?.Dispose();
426+
}
427+
catch (ObjectDisposedException) { }
428+
finally
429+
{
430+
validationTokenSource = newTokenSource;
431+
}
424432
}
425433
}
426434

0 commit comments

Comments
 (0)