Skip to content

Commit e2e254c

Browse files
committed
Merge remote-tracking branch 'origin/release/2.0' into 72-add-logging
2 parents 1296be5 + 0e12f14 commit e2e254c

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

FluentValidation.AutoValidation.Mvc/src/Filters/FluentValidationAutoValidationActionFilter.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,11 @@ public async Task OnActionExecutionAsync(ActionExecutingContext actionExecutingC
133133
if (actionExecutingContext.Result != null)
134134
{
135135
logger.LogTrace("Action result created for action '{Action}' on controller '{Controller}'.", controllerActionDescriptor.ActionName, controllerActionDescriptor.ControllerName);
136+
137+
return;
136138
}
137139

138-
logger.LogTrace("No action result created for action '{Action}' on controller '{Controller}'.", controllerActionDescriptor.ActionName, controllerActionDescriptor.ControllerName);
140+
logger.LogTrace("No action result created for action '{Action}' on controller '{Controller}'.", controllerActionDescriptor.ActionName, controllerActionDescriptor.ControllerName);
139141
}
140142

141143
logger.LogDebug("ModelState is valid for action '{Action}' on controller '{Controller}'. Proceeding with action execution.", controllerActionDescriptor.ActionName, controllerActionDescriptor.ControllerName);
@@ -180,6 +182,10 @@ private void HandleUnvalidatedEntries(ActionExecutingContext context)
180182
modelStateEntry.ValidationState = ModelValidationState.Skipped;
181183
}
182184
}
185+
else
186+
{
187+
logger.LogDebug("Skipping validation of unvalidated entries due to DisableBuiltInModelValidation being set to false.");
188+
}
183189
}
184190
}
185191
}

0 commit comments

Comments
 (0)