use the same context when handling errors

sinatra · Nov 21, 2007 · 5b3f081 · 5b3f081
1 parent a8085ec
commit 5b3f081
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/lib/sinatra.rb b/lib/sinatra.rb
@@ -104,15 +104,14 @@ def call(env)
       request.request_method.downcase.to_sym, 
       request.path_info
     )
+    context = EventContext.new(request, response)
     begin
-      context = EventContext.new(request, response)
       result = context.instance_eval(&route.block)
       context.body = Array(result.to_s)
       context.finish
     rescue => e
       raise e if config[:raise_errors]
       route = Sinatra.routes[500] || Error
-      context = EventContext.new(request, response)
       context.status 500
       context.body Array(context.instance_eval(&route.block))
       context.finish