From 6affcc507a7987ec69a63ba5c495fd691cf04864 Mon Sep 17 00:00:00 2001 From: StefanSpieker Date: Sat, 21 Dec 2019 13:52:12 +0100 Subject: [PATCH] JENKINS-60513: Added transient to SCMDescriptor#generation AtomicInteger to fix warnings (#4400) * JENKINS-60513: Added AtomicInteger to whitelist * JENKINS-60513: Mark field as transient * reverted whitelist change * renamed field to support deserialization of ols values --- core/src/main/java/hudson/scm/SCMDescriptor.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/scm/SCMDescriptor.java b/core/src/main/java/hudson/scm/SCMDescriptor.java index 860e4e52d8..f156aabeaf 100644 --- a/core/src/main/java/hudson/scm/SCMDescriptor.java +++ b/core/src/main/java/hudson/scm/SCMDescriptor.java @@ -53,8 +53,8 @@ public abstract class SCMDescriptor extends Descriptor { * that type. Otherwise this SCM will not have any repository browser. */ public transient final Class repositoryBrowser; - - private final AtomicInteger generation = new AtomicInteger(1); + + private transient final AtomicInteger atomicGeneration = new AtomicInteger(1); protected SCMDescriptor(Class clazz, Class repositoryBrowser) { super(clazz); @@ -82,7 +82,7 @@ public abstract class SCMDescriptor extends Descriptor { @Deprecated @Restricted(NoExternalUse.class) @RestrictedSince("TODO") public int getGeneration() { - return generation.get(); + return atomicGeneration.get(); } /** @@ -92,7 +92,7 @@ public abstract class SCMDescriptor extends Descriptor { @Deprecated @Restricted(NoExternalUse.class) @RestrictedSince("TODO") public void incrementGeneration() { - generation.incrementAndGet(); + atomicGeneration.incrementAndGet(); } // work around HUDSON-4514. The repositoryBrowser field was marked as non-transient until 1.325,