From 9e90b59894eeac2a0d03485fab3c9bafe1c46f9c Mon Sep 17 00:00:00 2001 From: James Nord Date: Mon, 17 Sep 2018 10:12:51 +0100 Subject: [PATCH] [Fixed JENKINS-53608] Incorect method signatures of readResolve() --- core/src/main/java/hudson/triggers/SCMTrigger.java | 3 ++- .../main/java/jenkins/security/apitoken/ApiTokenStats.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/hudson/triggers/SCMTrigger.java b/core/src/main/java/hudson/triggers/SCMTrigger.java index 83a6383d82..c5bb275863 100644 --- a/core/src/main/java/hudson/triggers/SCMTrigger.java +++ b/core/src/main/java/hudson/triggers/SCMTrigger.java @@ -245,10 +245,11 @@ public class SCMTrigger extends Trigger { private static final int THREADS_UPPER_BOUND = 100; private static final int THREADS_DEFAULT= 10; - private void readResolve() { + private Object readResolve() { if (maximumThreads == 0) { maximumThreads = THREADS_DEFAULT; } + return this; } public boolean isApplicable(Item item) { diff --git a/core/src/main/java/jenkins/security/apitoken/ApiTokenStats.java b/core/src/main/java/jenkins/security/apitoken/ApiTokenStats.java index f92fd8e701..d481361f61 100644 --- a/core/src/main/java/jenkins/security/apitoken/ApiTokenStats.java +++ b/core/src/main/java/jenkins/security/apitoken/ApiTokenStats.java @@ -60,7 +60,7 @@ public class ApiTokenStats implements Saveable { this.init(); } - private ApiTokenStats readResolve() { + private Object readResolve() { this.init(); return this; } @@ -217,7 +217,7 @@ public class ApiTokenStats implements Saveable { this.tokenUuid = tokenUuid; } - private SingleTokenStats readResolve() { + private Object readResolve() { if (this.useCounter != null) { // to avoid negative numbers to be injected this.useCounter = Math.max(0, this.useCounter); -- GitLab