Fixed that rendering a template would require a connection to the dat…

…abase #1146 git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1222 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
rails · Apr 19, 2005 · aa236c4 · aa236c4
1 parent 420b830
commit aa236c4
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/actionpack/lib/action_controller/benchmarking.rb b/actionpack/lib/action_controller/benchmarking.rb
@@ -21,9 +21,12 @@ def render_with_benchmark(template_name = default_template_name, status = "200 O
       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