Merge pull request #69 from bjoernhaeuser/synchronise-on-project

[JENKINS-41880] Synchronise on Fingerprint
jenkinsci · May 11, 2018 · c38b852 · c38b852
2 parents e00c616 + cca5639
commit c38b852
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/docker/commons/fingerprint/DockerFingerprints.java b/src/main/java/org/jenkinsci/plugins/docker/commons/fingerprint/DockerFingerprints.java
@@ -257,6 +257,7 @@ public static void addFromFacet(@CheckForNull String ancestorImageId, @Nonnull S
         long timestamp = System.currentTimeMillis();
         if (ancestorImageId != null) {
             Fingerprint f = forImage(run, ancestorImageId);
+            synchronized (f) {
             Collection<FingerprintFacet> facets = f.getFacets();
             DockerDescendantFingerprintFacet descendantFacet = null;
             for (FingerprintFacet facet : facets) {
@@ -278,8 +279,10 @@ public static void addFromFacet(@CheckForNull String ancestorImageId, @Nonnull S
             } finally {
                 bc.abort();
             }
+            }
         }
         Fingerprint f = forImage(run, descendantImageId);
+        synchronized (f) {
         Collection<FingerprintFacet> facets = f.getFacets();
         DockerAncestorFingerprintFacet ancestorFacet = null;
         for (FingerprintFacet facet : facets) {
@@ -303,6 +306,7 @@ public static void addFromFacet(@CheckForNull String ancestorImageId, @Nonnull S
         } finally {
             bc.abort();
         }
+        }
     }
 
 }