Do not throwing on InputBase.Dispose() if not in EditContext. (#31510)

* Do not throwing on InputBase.Dispose() if not in EditContext. Fixes #30990
dotnet · Apr 3, 2021 · fb38da9 · fb38da9
1 parent d32b018
commit fb38da9
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/Components/Web/src/Forms/InputBase.cs b/src/Components/Web/src/Forms/InputBase.cs
@@ -187,6 +187,7 @@ protected string CssClass
 
 
         /// <inheritdoc />
+        [MemberNotNull(nameof(EditContext), nameof(CascadedEditContext))]
         public override Task SetParametersAsync(ParameterView parameters)
         {
             parameters.SetParameterProperties(this);
@@ -315,7 +316,12 @@ protected virtual void Dispose(bool disposing)
 
         void IDisposable.Dispose()
         {
-            EditContext.OnValidationStateChanged -= _validationStateChangedHandler;
+            // When initialization in the SetParametersAsync method fails, the EditContext property can remain equal to null
+            if (EditContext is not null)
+            {
+                EditContext.OnValidationStateChanged -= _validationStateChangedHandler;
+            }
+
             Dispose(disposing: true);
         }
     }