Added assertion as suggested in JENKINS-22767.

jenkinsci · Dec 29, 2014 · 1078e6b · 1078e6b
1 parent bacca38
commit 1078e6b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java
@@ -468,7 +468,8 @@ protected synchronized R load(File dataDir, Index editInPlace) {
             Index copy = editInPlace!=null ? editInPlace : new Index(index);
 
             BuildReference<R> ref = createReference(r);
-            copy.byNumber.put(getNumberOf(r),ref);
+            BuildReference<R> 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
@@ -66,7 +66,7 @@ public boolean equals(Object o) {
         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 int hashCode() {
         return id.hashCode();
     }
 
+    @Override public String toString() {
+        R r = get();
+        return r != null ? r.toString() : id;
+    }
+
     /**
      * An abstraction of {@link Reference}.
      * @since 1.548