From 833c423268635ba79672ccdf6d17977a2a4d4181 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 23 Dec 2013 11:10:56 -0500 Subject: [PATCH] [JENKINS-18678] Tweaking API, adding @since & changelog for #1075, fixing purgeCache so that test can pass. --- changelog.html | 4 +++- core/src/main/java/hudson/model/AbstractProject.java | 2 +- .../java/jenkins/model/lazy/AbstractLazyLoadRunMap.java | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/changelog.html b/changelog.html index 399d17018c..35fb73406c 100644 --- a/changelog.html +++ b/changelog.html @@ -55,7 +55,9 @@ Upcoming changes diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 710cd92807..b43b8f16e3 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -1680,7 +1680,7 @@ public abstract class AbstractProject

,R extends A public void renameTo(String newName) throws IOException { super.renameTo(newName); // Update locations inside builds cache - builds.updateBaseDir(getBuildDir(), false); + builds.updateBaseDir(getBuildDir()); } protected final synchronized > diff --git a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java index 38c2f9805f..7b2515abe6 100644 --- a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java +++ b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java @@ -214,11 +214,10 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i * Updates base directory location after directory changes. * This method should be used on jobs renaming, etc. * @param dir Directory location - * @param reloadBuilds Purges cache after the directory update + * @since 1.546 */ - public final void updateBaseDir(File dir, boolean reloadBuilds) { + public final void updateBaseDir(File dir) { this.dir = dir; - purgeCache(); } /** @@ -230,6 +229,7 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i */ public void purgeCache() { index = new Index(); + fullyLoaded = false; loadIdOnDisk(); } -- GitLab