Skip to content

Commit

Permalink
[JENKINS-22631] The wrong (newer) build was sometimes being marked fo…
Browse files Browse the repository at this point in the history
…r fixing, depending on arbitrary directory listing order.

(cherry picked from commit 1bf993c)

Conflicts:
	core/src/main/java/jenkins/diagnostics/ooom/Problem.java
  • Loading branch information
jglick authored and olivergondza committed May 5, 2014
1 parent 7f04fa3 commit d7d566c
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions core/src/main/java/jenkins/diagnostics/ooom/Problem.java
Expand Up @@ -254,8 +254,10 @@ protected SortedMap<Integer,BuildPtr> scan() {
BuildPtr b = new BuildPtr(job,build,n);

BuildPtr o = builds.put(n, b);
if (o!=null)
LOGGER.warning("Multiple builds have the same number: "+o+" vs "+b);
if (o != null) {
LOGGER.log(WARNING, "Multiple builds have the same number: {0} vs. {1}", new Object[] {o, b});
offenders.add(b.compareTo(o) > 0 ? o : b);
}
}
} catch (XPathExpressionException e) {
LOGGER.log(WARNING, "Failed to inspect "+build, e);
Expand Down

0 comments on commit d7d566c

Please sign in to comment.