root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '3.3.x' 

Closes gh-42926
This commit is contained in:
Andy Wilkinson 2024-10-29 14:58:23 +00:00
parent 619b24a810 87f29f63aa
commit fbb09cd09c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java
View File

@ -165,10 +165,12 @@ class OnClassCondition extends FilteringSpringBootCondition {
catch (InterruptedException ex) { catch (InterruptedException ex) {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} }
if (this.failure != null) { Throwable failure = this.failure;
ReflectionUtils.rethrowRuntimeException(this.failure); if (failure != null) {
ReflectionUtils.rethrowRuntimeException(failure);
} }
return this.outcomes; ConditionOutcome[] outcomes = this.outcomes;
return (outcomes != null) ? outcomes : new ConditionOutcome[0];
} }
} }