--- CircuitBreaker/src/dk/thoerup/curcuitbreaker/web/ViewCircuitBreaker.java 2009/10/22 05:25:57 466 +++ CircuitBreaker/src/dk/thoerup/circuitbreaker/web/ViewCircuitBreaker.java 2010/03/09 07:21:41 628 @@ -1,13 +1,13 @@ -package dk.thoerup.curcuitbreaker.web; +package dk.thoerup.circuitbreaker.web; import java.util.Date; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import dk.thoerup.curcuitbreaker.AccountingCircuitBreaker; -import dk.thoerup.curcuitbreaker.CircuitBreaker; -import dk.thoerup.curcuitbreaker.CircuitBreakerManager; +import dk.thoerup.circuitbreaker.AccountingCircuitBreaker; +import dk.thoerup.circuitbreaker.CircuitBreaker; +import dk.thoerup.circuitbreaker.CircuitBreakerManager; public class ViewCircuitBreaker implements Command { @@ -45,6 +45,14 @@ return sb.toString(); } + public String formatDate(long date) { + if (date == 0L) { + return "-"; + } else { + return new Date(date).toString(); + } + } + public String execute(HttpServletRequest req, HttpServletResponse resp) { CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker( req.getParameter("breaker")); String uri = req.getRequestURI(); @@ -77,8 +85,11 @@ sb.append("Block count").append( acb.getBlockCount() ).append("\n"); sb.append("Total failure count").append( acb.getTotalFailureCount() ).append("\n"); sb.append("Total Call count").append( acb.getTotalCallCount() ).append("\n"); - sb.append("Last trip").append( new Date(acb.getLastTrip()).toString() ).append("\n"); - sb.append("Last resetCounters").append( new Date(acb.getLastResetCounters()).toString() ).append("\n"); + sb.append("Last failure").append( formatDate(acb.getLastFailure()) ).append("\n"); + sb.append("Last trip").append( formatDate(acb.getLastTrip()) ).append("\n"); + sb.append("Last reset").append( formatDate(acb.getLastReset()) ).append("\n"); + + sb.append("Last resetCounters").append( formatDate(acb.getLastResetCounters()) ).append("\n"); } sb.append("
\n");