Merge branch '2.7.x'

Closes gh-33230
This commit is contained in:
Phillip Webb
2022-11-16 12:06:20 -08:00

View File

@@ -104,18 +104,22 @@ public class BackgroundPreinitializer implements ApplicationListener<SpringAppli
public void run() {
runSafely(new ConversionServiceInitializer());
runSafely(new ValidationInitializer());
runSafely(new MessageConverterInitializer());
runSafely(new JacksonInitializer());
if (!runSafely(new MessageConverterInitializer())) {
// If the MessageConverterInitializer we still might be able to
// initialize Jackson
runSafely(new JacksonInitializer());
}
runSafely(new CharsetInitializer());
preinitializationComplete.countDown();
}
public void runSafely(Runnable runnable) {
boolean runSafely(Runnable runnable) {
try {
runnable.run();
return true;
}
catch (Throwable ex) {
// Ignore
return false;
}
}