aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-08-16 14:08:59 -0300
committerJosé Valim <jose.valim@gmail.com>2010-08-16 14:11:42 -0300
commit6e41cfb4e997842dd165b7c8cd2c0f3dc78c6af2 (patch)
tree81e9571ab6629cbf077190c1c6635343c4cf5686 /actionpack
parentaaec0072922166442457ded88c39cb5372ea5e67 (diff)
downloadrails-6e41cfb4e997842dd165b7c8cd2c0f3dc78c6af2.tar.gz
rails-6e41cfb4e997842dd165b7c8cd2c0f3dc78c6af2.tar.bz2
rails-6e41cfb4e997842dd165b7c8cd2c0f3dc78c6af2.zip
annoted_source_code may return nil if an error happens during template compiling.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/middleware/show_exceptions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index a7d3cb473f..ef0c9c51f5 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -127,7 +127,7 @@ module ActionDispatch
ActiveSupport::Deprecation.silence do
message = "\n#{exception.class} (#{exception.message}):\n"
- message << exception.annoted_source_code if exception.respond_to?(:annoted_source_code)
+ message << exception.annoted_source_code.to_s if exception.respond_to?(:annoted_source_code)
message << " " << application_trace(exception).join("\n ")
logger.fatal("#{message}\n\n")
end