Skip to content

Commit d063bf2

Browse files
authored
fix: NPE on named provider init/shutdown (#595)
* fix NPE on named provider init * add condition for not calling shutdown on null old provider Signed-off-by: liran2000 <[email protected]>
1 parent a2e4894 commit d063bf2

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/main/java/dev/openfeature/sdk/ProviderRepository.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,15 @@ private void initializeProvider(FeatureProvider newProvider,
135135
}
136136

137137
private void shutDownOld(FeatureProvider oldProvider,Consumer<FeatureProvider> afterShutdown) {
138-
if (!isProviderRegistered(oldProvider)) {
138+
if (oldProvider != null && !isProviderRegistered(oldProvider)) {
139139
shutdownProvider(oldProvider);
140140
afterShutdown.accept(oldProvider);
141141
}
142142
}
143143

144144
private boolean isProviderRegistered(FeatureProvider oldProvider) {
145-
return this.providers.containsValue(oldProvider) || this.defaultProvider.get().equals(oldProvider);
145+
return oldProvider != null && (this.providers.containsValue(oldProvider)
146+
|| this.defaultProvider.get().equals(oldProvider));
146147
}
147148

148149
private void shutdownProvider(FeatureProvider provider) {

0 commit comments

Comments
 (0)