From bfc9dad1ed9597054d2736c0ec3583f4fad3cce6 Mon Sep 17 00:00:00 2001 From: Egor18 Date: Thu, 22 Aug 2019 20:20:37 -0400 Subject: [PATCH 1/3] Fix counter which is not updated in the loop --- core/src/main/java/hudson/model/AbstractProject.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index d9870c2134..f962f35cb1 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -553,8 +553,7 @@ public abstract class AbstractProject

,R extends A * @return null if no such build exists. */ public final R getSomeBuildWithWorkspace() { - int cnt=0; - for (R b = getLastBuild(); cnt<5 && b!=null; b=b.getPreviousBuild()) { + for (R b = getLastBuild(); b!=null; b=b.getPreviousBuild()) { FilePath ws = b.getWorkspace(); if (ws!=null) return b; } @@ -562,8 +561,7 @@ public abstract class AbstractProject

,R extends A } private R getSomeBuildWithExistingWorkspace() throws IOException, InterruptedException { - int cnt=0; - for (R b = getLastBuild(); cnt<5 && b!=null; b=b.getPreviousBuild()) { + for (R b = getLastBuild(); b!=null; b=b.getPreviousBuild()) { FilePath ws = b.getWorkspace(); if (ws!=null && ws.exists()) return b; } From f91571ca45f3de26b32f829e589b5d20c9450c9e Mon Sep 17 00:00:00 2001 From: Egor Bredikhin <32983915+Egor18@users.noreply.github.com> Date: Thu, 29 Aug 2019 13:21:01 -0400 Subject: [PATCH 2/3] Update core/src/main/java/hudson/model/AbstractProject.java Co-Authored-By: Adrien Lecharpentier --- core/src/main/java/hudson/model/AbstractProject.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index f962f35cb1..93d829ddb5 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -561,7 +561,7 @@ public abstract class AbstractProject

,R extends A } private R getSomeBuildWithExistingWorkspace() throws IOException, InterruptedException { - for (R b = getLastBuild(); b!=null; b=b.getPreviousBuild()) { + for (R b = getLastBuild(); b != null; b = b.getPreviousBuild()) { FilePath ws = b.getWorkspace(); if (ws!=null && ws.exists()) return b; } From 10aebc560a6569c9d79590b90a4229ffaade57a5 Mon Sep 17 00:00:00 2001 From: Egor Bredikhin <32983915+Egor18@users.noreply.github.com> Date: Thu, 29 Aug 2019 13:21:08 -0400 Subject: [PATCH 3/3] Update core/src/main/java/hudson/model/AbstractProject.java Co-Authored-By: Adrien Lecharpentier --- core/src/main/java/hudson/model/AbstractProject.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 93d829ddb5..22c90b01ca 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -553,7 +553,7 @@ public abstract class AbstractProject

,R extends A * @return null if no such build exists. */ public final R getSomeBuildWithWorkspace() { - for (R b = getLastBuild(); b!=null; b=b.getPreviousBuild()) { + for (R b = getLastBuild(); b != null; b = b.getPreviousBuild()) { FilePath ws = b.getWorkspace(); if (ws!=null) return b; }