From 1078e6b68fcdce7bf3db459fc0074aca0625bbba Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 29 Dec 2014 10:01:22 -0500 Subject: [PATCH] Added assertion as suggested in JENKINS-22767. --- .../java/jenkins/model/lazy/AbstractLazyLoadRunMap.java | 3 ++- core/src/main/java/jenkins/model/lazy/BuildReference.java | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java index 26716cc55c..1fd3b58391 100644 --- a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java +++ b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java @@ -468,7 +468,8 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i Index copy = editInPlace!=null ? editInPlace : new Index(index); BuildReference ref = createReference(r); - copy.byNumber.put(getNumberOf(r),ref); + BuildReference old = copy.byNumber.put(getNumberOf(r), ref); + assert old == null || old.get() == null : "tried to overwrite " + old + " with " + ref; if (editInPlace==null) index = copy; diff --git a/core/src/main/java/jenkins/model/lazy/BuildReference.java b/core/src/main/java/jenkins/model/lazy/BuildReference.java index cc29fe1d15..93546d46e1 100644 --- a/core/src/main/java/jenkins/model/lazy/BuildReference.java +++ b/core/src/main/java/jenkins/model/lazy/BuildReference.java @@ -66,7 +66,7 @@ public final class BuildReference { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - BuildReference that = (BuildReference) o; + BuildReference that = (BuildReference) o; return id.equals(that.id); } @@ -76,6 +76,11 @@ public final class BuildReference { return id.hashCode(); } + @Override public String toString() { + R r = get(); + return r != null ? r.toString() : id; + } + /** * An abstraction of {@link Reference}. * @since 1.548