Improve thread-safety of OnClassCondition

Closes gh-41709
spring-projects · Oct 29, 2024 · b165370 · b165370
1 parent 0aff403
commit b165370
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/...gure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java b/...gure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java
@@ -165,10 +165,12 @@ public ConditionOutcome[] resolveOutcomes() {
 			catch (InterruptedException ex) {
 				Thread.currentThread().interrupt();
 			}
-			if (this.failure != null) {
-				ReflectionUtils.rethrowRuntimeException(this.failure);
+			Throwable failure = this.failure;
+			if (failure != null) {
+				ReflectionUtils.rethrowRuntimeException(failure);
 			}
-			return this.outcomes;
+			ConditionOutcome[] outcomes = this.outcomes;
+			return (outcomes != null) ? outcomes : new ConditionOutcome[0];
 		}
 
 	}