From: <sc...@hy...> - 2010-02-27 00:47:47
|
Author: scottmf Date: 2010-02-26 16:44:08 -0800 (Fri, 26 Feb 2010) New Revision: 14329 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14329 Modified: trunk/src/org/hyperic/util/timer/StopWatch.java Log: modified so that if timer has not been accessed it will display marker=null instead of marker=0 Modified: trunk/src/org/hyperic/util/timer/StopWatch.java =================================================================== --- trunk/src/org/hyperic/util/timer/StopWatch.java 2010-02-27 00:37:42 UTC (rev 14328) +++ trunk/src/org/hyperic/util/timer/StopWatch.java 2010-02-27 00:44:08 UTC (rev 14329) @@ -104,13 +104,17 @@ } private void writeBuf(String marker, List tsList, StringBuffer buf) { - long total = 0l; + long total = -1; for (Iterator it=tsList.iterator();it.hasNext();) { TimeSlice ts = (TimeSlice)it.next(); - total += ts.getElapsed(); + Long elapsed = ts.getElapsed(); + if (elapsed == null) { + continue; + } + total += elapsed.longValue(); } buf.append(" [").append(marker).append("=") - .append(StringUtil.formatDuration(total, 2, true)) + .append((total < 0) ? "null" : StringUtil.formatDuration(total, 2, true)) .append("]"); } @@ -121,16 +125,19 @@ public TimeSlice (String marker) { _marker = marker; - _begin = _end=now(); + _begin = now(); + _end = 0; } public void setFinished () { _end= now(); } - public long getElapsed() { - final long end = (_end == 0) ? now() : _end; - return end - _begin; + public Long getElapsed() { + if (_end == 0) { + return null; + } + return new Long(_end - _begin); } } } |