Merge pull request #80 from jonsten/fixConcurrent

oleg-nenashev · web-flow · commit 923fb1e8db2f · 2019-12-23T09:28:08.000+01:00
[JENKINS-59501] - Add synchronization to `addRunFacet()` to prevent `ConcurrentModificationException`
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
@@ -223,6 +223,7 @@ private DockerFingerprints() {} // no instantiation
     public static void addRunFacet(@Nonnull ContainerRecord record, @Nonnull Run<?,?> run) throws IOException {
         String imageId = record.getImageId();
         Fingerprint f = forImage(run, imageId);
+        synchronized (f) {
         Collection<FingerprintFacet> facets = f.getFacets();
         DockerRunFingerprintFacet runFacet = null;
         for (FingerprintFacet facet : facets) {
@@ -244,6 +245,7 @@ public static void addRunFacet(@Nonnull ContainerRecord record, @Nonnull Run<?,?
         } finally {
             bc.abort();
         }
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,7 @@ private DockerFingerprints() {} // no instantiation`
`223`	`223`	`public static void addRunFacet(@Nonnull ContainerRecord record, @Nonnull Run<?,?> run) throws IOException {`
`224`	`224`	`String imageId = record.getImageId();`
`225`	`225`	`Fingerprint f = forImage(run, imageId);`
	`226`	`+ synchronized (f) {`
`226`	`227`	`Collection<FingerprintFacet> facets = f.getFacets();`
`227`	`228`	`DockerRunFingerprintFacet runFacet = null;`
`228`	`229`	`for (FingerprintFacet facet : facets) {`
`@@ -244,6 +245,7 @@ public static void addRunFacet(@Nonnull ContainerRecord record, @Nonnull Run<?,?`
`244`	`245`	`} finally {`
`245`	`246`	`bc.abort();`
`246`	`247`	`}`
	`248`	`+ }`
`247`	`249`	`}`
`248`	`250`
`249`	`251`	`/**`