From: Jonathan Rockway <jon@jrock.us>
Date: Fri, 19 Oct 2007 05:00:40 +0000 (+0000)
Subject: resolve conflict in the correct direction this time :)
X-Git-Tag: 5.7099_04~120
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=596677b657fca7a5bb47fab5cb081cd902dbee03

resolve conflict in the correct direction this time :)
---

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index e63fb98..e4ff178 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1347,8 +1347,8 @@ sub finalize {
         $c->finalize_body;
     }
     
-    if ($c->use_stats) {
-        my $elapsed = tv_interval($c->stats->getNodeValue);
+    if ($c->use_stats) {        
+        my $elapsed = sprintf '%f', $c->stats->elapsed;
         my $av = $elapsed == 0 ? '??' : sprintf '%.3f', 1 / $elapsed;
         $c->log->info(
             "Request took ${elapsed}s ($av/s)\n" . $c->stats->report . "\n" );