[Fixed JENKINS-53608] Incorect method signatures of readResolve()

jtnord · jtnord · commit 9e90b59894ee · 2018-09-17T10:15:15.000+01:00
diff --git a/core/src/main/java/hudson/triggers/SCMTrigger.java b/core/src/main/java/hudson/triggers/SCMTrigger.java
@@ -245,10 +245,11 @@ private static ThreadFactory threadFactory() {
         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
@@ -60,7 +60,7 @@ public ApiTokenStats() {
         this.init();
     }
     
-    private ApiTokenStats readResolve() {
+    private Object readResolve() {
         this.init();
         return this;
     }
@@ -217,7 +217,7 @@ private SingleTokenStats(String tokenUuid) {
             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);

Original file line number	Diff line number	Diff line change
`@@ -245,10 +245,11 @@ private static ThreadFactory threadFactory() {`
`245`	`245`	`private static final int THREADS_UPPER_BOUND = 100;`
`246`	`246`	`private static final int THREADS_DEFAULT= 10;`
`247`	`247`
`248`		`- private void readResolve() {`
	`248`	`+ private Object readResolve() {`
`249`	`249`	`if (maximumThreads == 0) {`
`250`	`250`	`maximumThreads = THREADS_DEFAULT;`
`251`	`251`	`}`
	`252`	`+ return this;`
`252`	`253`	`}`
`253`	`254`
`254`	`255`	`public boolean isApplicable(Item item) {`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public ApiTokenStats() {`
`60`	`60`	`this.init();`
`61`	`61`	`}`
`62`	`62`
`63`		`- private ApiTokenStats readResolve() {`
	`63`	`+ private Object readResolve() {`
`64`	`64`	`this.init();`
`65`	`65`	`return this;`
`66`	`66`	`}`
`@@ -217,7 +217,7 @@ private SingleTokenStats(String tokenUuid) {`
`217`	`217`	`this.tokenUuid = tokenUuid;`
`218`	`218`	`}`
`219`	`219`
`220`		`- private SingleTokenStats readResolve() {`
	`220`	`+ private Object readResolve() {`
`221`	`221`	`if (this.useCounter != null) {`
`222`	`222`	`// to avoid negative numbers to be injected`
`223`	`223`	`this.useCounter = Math.max(0, this.useCounter);`