Skip to content

Commit e02a22e

Browse files
committed
fix: avoid potential NPE
1 parent 256053d commit e02a22e

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationService.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
import java.time.Duration;
44
import java.util.Optional;
55
import java.util.Set;
6-
import java.util.concurrent.*;
6+
import java.util.concurrent.ExecutorService;
7+
import java.util.concurrent.LinkedBlockingDeque;
8+
import java.util.concurrent.ThreadPoolExecutor;
9+
import java.util.concurrent.TimeUnit;
710
import java.util.function.Consumer;
811

912
import org.slf4j.Logger;
@@ -252,8 +255,11 @@ default ResourceClassResolver getResourceClassResolver() {
252255

253256
static ConfigurationService overrideCurrent(ConfigurationService service,
254257
Consumer<ConfigurationServiceOverrider> overrider) {
255-
final var toOverride = new ConfigurationServiceOverrider(service);
256-
overrider.accept(toOverride);
257-
return toOverride.build();
258+
if (overrider != null) {
259+
final var toOverride = new ConfigurationServiceOverrider(service);
260+
overrider.accept(toOverride);
261+
return toOverride.build();
262+
}
263+
return service;
258264
}
259265
}

0 commit comments

Comments
 (0)