Merge pull request #3198 from johnou/contention-JENKINS-48505

[JENKINS-48505] - Invoke optimistic get before computeIfAbsent to avoid contention.
jenkinsci · Dec 16, 2017 · 3a52963 · 3a52963
2 parents 09bcc5d + dce450e
commit 3a52963
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
@@ -2595,7 +2595,8 @@ public Injector getInjector() {
      */
     @SuppressWarnings({"unchecked"})
     public <T> ExtensionList<T> getExtensionList(Class<T> extensionType) {
-        return extensionLists.computeIfAbsent(extensionType, key -> ExtensionList.create(this, key));
+        ExtensionList<T> extensionList = extensionLists.get(extensionType);
+        return extensionList != null ? extensionList : extensionLists.computeIfAbsent(extensionType, key -> ExtensionList.create(this, key));
     }
 
     /**