Skip to content

Commit 0f4ced8

Browse files
committed
NIFI-14472: Guard against null kubernetesClient in KubernetesConfigMapStateProvider.shutdown()
shutdown() was calling kubernetesClient.close() unconditionally. If the provider was never initialized (e.g. in unit tests that only call getSupportedScopes()), kubernetesClient is null and a NullPointerException is thrown from the @AfterEach teardown. Also null-guard the logger reference for the same reason.
1 parent 98fa7ea commit 0f4ced8

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

  • nifi-framework-bundle/nifi-framework-extensions/nifi-framework-kubernetes-bundle/nifi-framework-kubernetes-state-provider/src/main/java/org/apache/nifi/kubernetes/state/provider

nifi-framework-bundle/nifi-framework-extensions/nifi-framework-kubernetes-bundle/nifi-framework-kubernetes-state-provider/src/main/java/org/apache/nifi/kubernetes/state/provider/KubernetesConfigMapStateProvider.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,16 @@ public void initialize(final StateProviderInitializationContext context) {
137137
}
138138

139139
/**
140-
* Shutdown Provider
140+
* Shutdown Provider. Safe to invoke even when the Provider was never initialized.
141141
*/
142142
@Override
143143
public void shutdown() {
144-
kubernetesClient.close();
145-
logger.info("Provider shutdown");
144+
if (kubernetesClient != null) {
145+
kubernetesClient.close();
146+
}
147+
if (logger != null) {
148+
logger.info("Provider shutdown");
149+
}
146150
}
147151

148152
/**

0 commit comments

Comments
 (0)