Don't remove state annotation more than once

dotnet · Jul 1, 2019 · bd290d5 · bd290d5
1 parent 9ad2086
commit bd290d5
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/EFCore/Metadata/Conventions/NonNullableConventionBase.cs b/src/EFCore/Metadata/Conventions/NonNullableConventionBase.cs
@@ -134,7 +134,12 @@ protected virtual bool IsNonNullable(
         /// <param name="modelBuilder"> The builder for the model. </param>
         /// <param name="context"> Additional information associated with convention execution. </param>
         public virtual void ProcessModelFinalized(IConventionModelBuilder modelBuilder, IConventionContext<IConventionModelBuilder> context)
-            => modelBuilder.Metadata.RemoveAnnotation(StateAnnotationName);
+        {
+            if (modelBuilder.Metadata.FindAnnotation(StateAnnotationName) != null)
+            {
+                modelBuilder.Metadata.RemoveAnnotation(StateAnnotationName);
+            }
+        }
 
         NonNullabilityConventionState GetOrInitializeState(IConventionModelBuilder modelBuilder)
             => (NonNullabilityConventionState)(