Skip to content

Commit 6eac930

Browse files
committed
fix issue
Signed-off-by: wind57 <[email protected]>
1 parent c60c907 commit 6eac930

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/KubernetesConfigDataLocationResolver.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,12 @@ private static PropertyHolder of(ConfigDataLocationResolverContext context) {
174174
private static KubernetesClientProperties clientProperties(ConfigDataLocationResolverContext context,
175175
String namespace) {
176176
KubernetesClientProperties kubernetesClientProperties;
177+
ConfigurableBootstrapContext bootstrapContext = context.getBootstrapContext();
177178

178-
if (context.getBootstrapContext().isRegistered(KubernetesClientProperties.class)) {
179-
kubernetesClientProperties = context.getBootstrapContext()
180-
.get(KubernetesClientProperties.class)
181-
.withNamespace(namespace);
179+
KubernetesClientProperties clientProperties;
180+
if (bootstrapContext.isRegistered(KubernetesClientProperties.class) &&
181+
(clientProperties = bootstrapContext.get(KubernetesClientProperties.class)) != null) {
182+
kubernetesClientProperties = clientProperties.withNamespace(namespace);
182183
}
183184
else {
184185
kubernetesClientProperties = context.getBinder()

0 commit comments

Comments
 (0)