diff --git a/changelog.html b/changelog.html
index 84242554e0..9f67ad35ad 100644
--- a/changelog.html
+++ b/changelog.html
@@ -82,6 +82,9 @@ Upcoming changes
Wrong log message for out-of-order build record repair.
(issue 20730)
+
+ Existing Fingerprint Action is reused and not added a second time.
+ (issue 19832)
diff --git a/core/src/main/java/hudson/tasks/Fingerprinter.java b/core/src/main/java/hudson/tasks/Fingerprinter.java
index 046231d8f2..ef01582c48 100644
--- a/core/src/main/java/hudson/tasks/Fingerprinter.java
+++ b/core/src/main/java/hudson/tasks/Fingerprinter.java
@@ -132,7 +132,12 @@ public class Fingerprinter extends Recorder implements Serializable, DependencyD
record(build, listener, record, expandedArtifacts);
}
- build.addAction(new FingerprintAction(build,record));
+ FingerprintAction fingerprintAction = build.getAction(FingerprintAction.class);
+ if (fingerprintAction != null) {
+ fingerprintAction.add(record);
+ } else {
+ build.addAction(new FingerprintAction(build,record));
+ }
if (enableFingerprintsInDependencyGraph) {
Jenkins.getInstance().rebuildDependencyGraphAsync();
diff --git a/test/src/test/java/hudson/tasks/FingerprinterTest.java b/test/src/test/java/hudson/tasks/FingerprinterTest.java
index fb6924d6a2..b270c1ca4e 100644
--- a/test/src/test/java/hudson/tasks/FingerprinterTest.java
+++ b/test/src/test/java/hudson/tasks/FingerprinterTest.java
@@ -24,17 +24,15 @@
package hudson.tasks;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import hudson.Launcher;
import hudson.Util;
import hudson.XmlFile;
import hudson.matrix.Axis;
import hudson.matrix.AxisList;
import hudson.matrix.MatrixProject;
-import hudson.model.AbstractProject;
-import hudson.model.Fingerprint;
-import hudson.model.FingerprintCleanupThread;
-import hudson.model.FreeStyleBuild;
-import hudson.model.FreeStyleProject;
-import hudson.model.Result;
+import hudson.model.*;
import hudson.util.RunList;
import java.io.File;
@@ -43,10 +41,13 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
+
+import static org.hamcrest.Matchers.hasSize;
import static org.junit.Assert.*;
import hudson.util.StreamTaskListener;
import jenkins.model.Jenkins;
+import org.hamcrest.Matchers;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
@@ -111,6 +112,26 @@ public class FingerprinterTest {
assertTrue(downstreamProjects.contains(downstream));
}
+ private static class FingerprintAddingBuilder extends Builder {
+ @Override
+ public boolean perform(AbstractBuild, ?> build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException {
+ build.addAction(new Fingerprinter.FingerprintAction(build, ImmutableMap.of(singleFiles2[0], "fakefingerprint")));
+ return true;
+ }
+ }
+
+ @Test public void presentFingerprintActionIsReused() throws Exception {
+ FreeStyleProject project = createFreeStyleProjectWithFingerprints(singleContents, singleFiles);
+ project.getBuildersList().add(new FingerprintAddingBuilder());
+
+ FreeStyleBuild build = j.buildAndAssertSuccess(project);
+
+ assertThat(build.getActions(Fingerprinter.FingerprintAction.class), hasSize(1));
+
+ Fingerprinter.FingerprintAction action = build.getAction(Fingerprinter.FingerprintAction.class);
+ assertEquals(action.getRecords().keySet(), ImmutableSet.of(singleFiles2[0], singleFiles[0]));
+ }
+
@Test public void multipleUpstreamDependencies() throws Exception {
FreeStyleProject upstream = createFreeStyleProjectWithFingerprints(singleContents, singleFiles);
FreeStyleProject upstream2 = createFreeStyleProjectWithFingerprints(singleContents2, singleFiles2);