Fixed that rendering a template would require a connection to the database #1146

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1222 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 6 insertions, 3 deletions

diff --git a/actionpack/lib/action_controller/benchmarking.rb b/actionpack/lib/action_controller/benchmarking.rb
index 1cc7adb8eb..25d9f50e74 100644
--- a/actionpack/lib/action_controller/benchmarking.rb
+++ b/actionpack/lib/action_controller/benchmarking.rb
@@ -21,9 +21,12 @@ module ActionController #:nodoc:
       else
         db_runtime = ActiveRecord::Base.connection.reset_runtime if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected?
         @rendering_runtime = Benchmark::measure{ render_without_benchmark(template_name, status) }.real
-        @db_rt_before_render = db_runtime
-        @db_rt_after_render = ActiveRecord::Base.connection.reset_runtime if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected?
-        @rendering_runtime -= @db_rt_after_render
+
+        if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected?
+          @db_rt_before_render = db_runtime
+          @db_rt_after_render = ActiveRecord::Base.connection.reset_runtime
+          @rendering_runtime -= @db_rt_after_render
+        end
       end
     end