You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2012/03/07 17:26:11 UTC

git commit: Core: Fixed error in 501 XML view

Updated Branches:
  refs/heads/master 7b10fa8fc -> a1a15d188


Core: Fixed error in 501 XML view


Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/a1a15d18
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/a1a15d18
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/a1a15d18

Branch: refs/heads/master
Commit: a1a15d18882b385b2d1e2970fd18e67ff81dfebf
Parents: 7b10fa8
Author: Michal Fojtik <mf...@redhat.com>
Authored: Wed Mar 7 17:27:11 2012 +0100
Committer: Michal fojtik <mf...@redhat.com>
Committed: Wed Mar 7 17:27:11 2012 +0100

----------------------------------------------------------------------
 server/views/errors/500.xml.haml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/a1a15d18/server/views/errors/500.xml.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/500.xml.haml b/server/views/errors/500.xml.haml
index 0b2d14a..b3e71e2 100644
--- a/server/views/errors/500.xml.haml
+++ b/server/views/errors/500.xml.haml
@@ -5,8 +5,8 @@
   %backend{ :driver => driver_symbol, :provider => "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}" }
     %code=response.status
   %message< #{cdata @error.message}
-  - if @error.respond_to? :backtrace
-    %backtrace=cdata @error.backtrace.join("\n")
+  - if @error.respond_to?(:backtrace) and !@error.backtrace.nil?
+    %backtrace=cdata(@error.backtrace.join("\n"))
   - if params
     %request
       - params.each do |k, v|