Browse Source

Use model.deepMarkAsSkipped in SpringProfileModelHandler

Switch `model.markAsSkipped` to `model.deepMarkAsSkipped` in
`SpringProfileModelHandler`.

Although the current call doesn't appear to be causing issues,
it seems best to align our <springProfile> support with the way
that Logback implements its own `<if>` support.

Closes gh-33618
pull/33629/head
Phillip Webb 3 years ago
parent
commit
2ed512ddb5
  1. 2
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringProfileModelHandler.java

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringProfileModelHandler.java

@ -50,7 +50,7 @@ class SpringProfileModelHandler extends ModelHandlerBase { @@ -50,7 +50,7 @@ class SpringProfileModelHandler extends ModelHandlerBase {
public void handle(ModelInterpretationContext intercon, Model model) throws ModelHandlerException {
SpringProfileModel profileModel = (SpringProfileModel) model;
if (!acceptsProfiles(intercon, profileModel)) {
model.markAsSkipped();
model.deepMarkAsSkipped();
}
}

Loading…
Cancel
Save