[JENKINS-74777] Improve locking around `jenkins.branch.MultiBranchPro…

…ject#getProjectFactory` (#494)
jenkinsci · Nov 6, 2024 · 4ba3da2 · 4ba3da2
1 parent 20ee565
commit 4ba3da2
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/main/java/jenkins/branch/MultiBranchProject.java b/src/main/java/jenkins/branch/MultiBranchProject.java
@@ -160,7 +160,7 @@ public abstract class MultiBranchProject<P extends Job<P, R> & TopLevelItem,
     /**
      * The factory for building child job instances.
      */
-    private BranchProjectFactory<P, R> factory;
+    private volatile BranchProjectFactory<P, R> factory;
 
     private transient String srcDigest, facDigest;
 
@@ -339,11 +339,19 @@ public String getSourcePronoun() {
      * @return the {@link BranchProjectFactory}.
      */
     @NonNull
-    public synchronized BranchProjectFactory<P, R> getProjectFactory() {
-        if (factory == null) {
-            setProjectFactory(newProjectFactory());
+    @SuppressFBWarnings(value = "UG_SYNC_SET_UNSYNC_GET", justification = "False positive: synchronization is handled via double-checked locking")
+    public BranchProjectFactory<P, R> getProjectFactory() {
+        BranchProjectFactory<P, R> value = factory;
+        if (value == null) {
+            synchronized (this) {
+                value = factory;
+                if (value == null) {
+                    value = newProjectFactory();
+                    setProjectFactory(value);
+                }
+            }
         }
-        return factory;
+        return value;
     }
 
     /**