applied elapsed time handling patch from Emanuele Zeppieri

diff --git a/Changes b/Changes
index f215f49..7745f12 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,8 +1,11 @@
 This file documents the revision history for Perl extension Catalyst.
 
+X.XXXX
         - Fix bug where a nested component would be setup twice
         - Make ensure_class_loaded behave better with malformed class name
-               - Make _register_plugin use ensure_class_loaded
+        - Make _register_plugin use ensure_class_loaded
+        - Remove 'Argument "??" isn't numeric in sprintf' warning
+          (Emanuele Zeppieri)
 
 5.7008
         - Fixed a bug where Content-Length could be set to 0 if a filehandle

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index a3f918b..e20a2cf 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1353,7 +1353,7 @@ sub finalize {
     
     if ($c->debug) {
         my $elapsed = sprintf '%f', tv_interval($c->stats->getNodeValue);
-        my $av = sprintf '%.3f', ( $elapsed == 0 ? '??' : ( 1 / $elapsed ) );
+        my $av = $elapsed == 0 ? '??' : sprintf '%.3f', 1 / $elapsed;
         
         my $t = Text::SimpleTable->new( [ 62, 'Action' ], [ 9, 'Time' ] );
         $c->stats->traverse(