From: Tom Hughes <tom@compton.nu>
Date: Fri, 2 Dec 2016 09:38:18 +0000 (+0000)
Subject: Remove redundant creation of an exception object
X-Git-Tag: live~3690
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ec6e096274553072205cb6fd7e7b54e2c807b8c7?ds=inline

Remove redundant creation of an exception object
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a52c006fa..2b6d62bb5 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -360,10 +360,6 @@ class ApplicationController < ActionController::Base
     ex = ex.original_exception
 
     if ex.is_a?(ActiveRecord::StatementInvalid) && ex.message =~ /execution expired/
-      ex = Timeout::Error.new
-    end
-
-    if ex.is_a?(Timeout::Error)
       render :action => "timeout"
     else
       raise