[logging-log4j2] branch release-2.x updated: LOG4J2-3147 Fix Spring package check in KubernetesLookup. (#569)

[vy]

This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/release-2.x by this push:
     new f9dc92b  LOG4J2-3147 Fix Spring package check in KubernetesLookup. 
(#569)
f9dc92b is described below

commit f9dc92b52b17b5033452e862ea0c2ab0e187117c
Author: Matthew McMahon <macca...@gmail.com>
AuthorDate: Thu Aug 26 17:25:26 2021 +1000

    LOG4J2-3147 Fix Spring package check in KubernetesLookup. (#569)
    
    Co-authored-by: Matthew McMahon <matthew.mcma...@thetradedesk.com>
    # Conflicts:
    #   
log4j-kubernetes/src/main/java/org/apache/logging/log4j/kubernetes/KubernetesLookup.java
---
 .../org/apache/logging/log4j/kubernetes/KubernetesLookup.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/log4j-kubernetes/src/main/java/org/apache/logging/log4j/kubernetes/KubernetesLookup.java
 
b/log4j-kubernetes/src/main/java/org/apache/logging/log4j/kubernetes/KubernetesLookup.java
index a3dd948..09efe42 100644
--- 
a/log4j-kubernetes/src/main/java/org/apache/logging/log4j/kubernetes/KubernetesLookup.java
+++ 
b/log4j-kubernetes/src/main/java/org/apache/logging/log4j/kubernetes/KubernetesLookup.java
@@ -55,9 +55,10 @@ public class KubernetesLookup extends AbstractLookup {
     private static final String SPRING_ENVIRONMENT_KEY = "SpringEnvironment";
 
     private static volatile KubernetesInfo kubernetesInfo;
-    private static Lock initLock = new ReentrantLock();
-    private static boolean isSpringIncluded =
-            
LoaderUtil.isClassAvailable("org.apache.logging.log4j.spring.cloud.config.client.SpringEnvironmentHolder");
+    private static final Lock initLock = new ReentrantLock();
+    private static final boolean isSpringIncluded =
+            
LoaderUtil.isClassAvailable("org.apache.logging.log4j.spring.cloud.config.client.SpringEnvironmentHolder")
+                    || 
LoaderUtil.isClassAvailable("org.apache.logging.log4j.spring.boot.SpringEnvironmentHolder");
     private Pod pod;
     private Namespace namespace;
     private URL masterUrl;
@@ -91,7 +92,7 @@ public class KubernetesLookup extends AbstractLookup {
                             info.masterUrl = client.getMasterUrl();
                             if (pod != null) {
                                 info.namespace = 
pod.getMetadata().getNamespace();
-                                namespace = namespace = 
client.namespaces().withName(info.namespace).get();
+                                namespace = 
client.namespaces().withName(info.namespace).get();
                             }
                         } else {
                             LOGGER.warn("Kubernetes is not available for 
access");