Skip to content

Commit c1fe43a

Browse files
committed
Merge pull request #33220 from sdeleuze
* pr/33220: Polish 'Refine BackgroundPreinitializer Jackson initialization' Refine BackgroundPreinitializer Jackson initialization Closes gh-33220
2 parents a650361 + 6cc6a15 commit c1fe43a

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,18 +100,22 @@ private void performPreinitialization() {
100100
public void run() {
101101
runSafely(new ConversionServiceInitializer());
102102
runSafely(new ValidationInitializer());
103-
runSafely(new MessageConverterInitializer());
104-
runSafely(new JacksonInitializer());
103+
if (!runSafely(new MessageConverterInitializer())) {
104+
// If the MessageConverterInitializer we still might be able to
105+
// initialize Jackson
106+
runSafely(new JacksonInitializer());
107+
}
105108
runSafely(new CharsetInitializer());
106109
preinitializationComplete.countDown();
107110
}
108111

109-
public void runSafely(Runnable runnable) {
112+
boolean runSafely(Runnable runnable) {
110113
try {
111114
runnable.run();
115+
return true;
112116
}
113117
catch (Throwable ex) {
114-
// Ignore
118+
return false;
115119
}
116120
}
117121

0 commit comments

Comments
 (0)