diff options
| author | Alain Kermis <alain.kermis@sonarsource.com> | 2025-01-31 11:26:23 +0100 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2025-02-03 20:03:03 +0000 |
| commit | 471ccd4d09c9a4118a8a65180189256042baaa84 (patch) | |
| tree | 36042dfe08fa086278661e09f8a5b9b1918b4c28 /sonar-core/src | |
| parent | abd63e020109bb4937bfacd2b25be233c8df200b (diff) | |
| download | sonarqube-471ccd4d09c9a4118a8a65180189256042baaa84.tar.gz sonarqube-471ccd4d09c9a4118a8a65180189256042baaa84.zip | |
SONAR-23389 Fix CE failing to stop due to NPE in shutting down Spring Container
Diffstat (limited to 'sonar-core/src')
| -rw-r--r-- | sonar-core/src/main/java/org/sonar/core/platform/SpringComponentContainer.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sonar-core/src/main/java/org/sonar/core/platform/SpringComponentContainer.java b/sonar-core/src/main/java/org/sonar/core/platform/SpringComponentContainer.java index 93cb670079b..dea3850a81c 100644 --- a/sonar-core/src/main/java/org/sonar/core/platform/SpringComponentContainer.java +++ b/sonar-core/src/main/java/org/sonar/core/platform/SpringComponentContainer.java @@ -24,6 +24,7 @@ import com.google.common.collect.Lists; import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.function.Supplier; @@ -243,7 +244,7 @@ public class SpringComponentContainer implements StartableContainer { private void stopChildren() { // loop over a copy of list of children in reverse order - Lists.reverse(new ArrayList<>(this.children)).forEach(SpringComponentContainer::stopComponents); + Lists.reverse(new ArrayList<>(this.children)).stream().filter(Objects::nonNull).forEach(SpringComponentContainer::stopComponents); } public SpringComponentContainer createChild() { |