From c0db657f2245b8d9a6b1db727db47b85dce3d3bd Mon Sep 17 00:00:00 2001 From: mindless Date: Wed, 28 Apr 2010 18:58:12 +0000 Subject: [PATCH] [HUDSON-5844] set build duration to zero if it comes out negative (clock was set during a short build?). Also added i18n for getDurationString() result when build is in progress. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@30455 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/Run.java | 11 +++++------ .../main/resources/hudson/model/Messages.properties | 4 +++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java index 4c31744cc8..3880fe0eca 100644 --- a/core/src/main/java/hudson/model/Run.java +++ b/core/src/main/java/hudson/model/Run.java @@ -1,7 +1,8 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Daniel Dyer, Red Hat, Inc., Tom Huybrechts + * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, + * Daniel Dyer, Red Hat, Inc., Tom Huybrechts * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -50,7 +51,6 @@ import hudson.tasks.BuildStep; import hudson.tasks.test.AbstractTestResultAction; import hudson.util.FlushProofOutputStream; import hudson.util.IOException2; -import hudson.util.IOUtils; import hudson.util.LogTaskListener; import hudson.util.XStream2; import hudson.util.ProcessTree; @@ -58,7 +58,6 @@ import hudson.util.ProcessTree; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; -import java.io.FilterOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -80,7 +79,6 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; -import java.util.ListIterator; import java.util.Locale; import java.util.Map; import java.util.Set; @@ -522,7 +520,8 @@ public abstract class Run ,RunT extends Run,RunT extends Run