workaround JENKINS-48505 JDK-8184907

jenkinsci · Dec 13, 2017 · 10c7ca8 · 10c7ca8
1 parent 36bd847
commit 10c7ca8
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/splunk-devops/src/main/java/com/splunk/splunkjenkins/SplunkJenkinsInstallation.java b/splunk-devops/src/main/java/com/splunk/splunkjenkins/SplunkJenkinsInstallation.java
@@ -99,16 +99,14 @@ public SplunkJenkinsInstallation() {
     }
 
     public static SplunkJenkinsInstallation get() {
-        if (cachedConfig != null) {
-            return cachedConfig;
-        } else {
-            if (Jenkins.getInstance() != null && GlobalConfiguration.all() != null) {
-                return GlobalConfiguration.all().get(SplunkJenkinsInstallation.class);
-            } else {
-                //jenkins is in shutdown phase
-                throw new IllegalStateException("Jenkins has not been started, or was already shut down");
+        if (cachedConfig == null) {
+            synchronized (SplunkJenkinsInstallation.class) {
+                if (cachedConfig == null) {
+                    cachedConfig = (SplunkJenkinsInstallation) Jenkins.getActiveInstance().getDescriptor(SplunkJenkinsInstallation.class);
+                }
             }
         }
+        return cachedConfig;
     }
 
     /**