commit a2087146ab449b8833788215e40d87b202f64a17
author Ralph Goers <rgoers@apache.org> Tue Apr 06 22:58:36 2021 -0700
committer Ralph Goers <rgoers@apache.org> Tue Apr 06 22:58:36 2021 -0700
tree a6b93efbab9d7f1e1ddeffbec3093a3f2a19b5e3
parent 3313e6f9d8b987b8a9d3c4b8ee3498a6b8fead5e

Fix issue found by spotbugs

log4j-kubernetes/src/main/java/org/apache/logging/log4j/kubernetes/KubernetesLookup.java

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 2a16a9e..016c67c 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
@@ -78,9 +78,9 @@
     private boolean initialize() {
         if (kubernetesInfo == null || (isSpringIncluded && !kubernetesInfo.isSpringActive)) {
             initLock.lock();
-            boolean isSpringActive = isSpringActive();
-            if (kubernetesInfo == null || (!kubernetesInfo.isSpringActive && isSpringActive)) {
-                try {
+            try {
+                boolean isSpringActive = isSpringActive();
+                if (kubernetesInfo == null || (!kubernetesInfo.isSpringActive && isSpringActive)) {
                     KubernetesInfo info = new KubernetesInfo();
                     KubernetesClient client = null;
                     info.isSpringActive = isSpringActive;
@@ -152,9 +152,9 @@
 
                         kubernetesInfo = info;
                     }
-                } finally {
-                    initLock.unlock();
                 }
+            } finally {
+                initLock.unlock();
             }
         }
         return kubernetesInfo != null;