Don't rescue Exception class (#31387).

Patch by Go MAEDA and Pavel Rosický.


git-svn-id: http://svn.redmine.org/redmine/trunk@18197 e93f8b46-1217-0410-a6f0-8f06a7374b81

7 files changed, 10 insertions, 10 deletions

diff --git a/app/models/import.rb b/app/models/import.rb
index ef4b0321e..721e812bd 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -67,7 +67,7 @@ class Import < ActiveRecord::Base
       begin
         content = File.read(filepath, 256)
         separator = [',', ';'].sort_by {|sep| content.count(sep) }.last
-      rescue Exception => e
+      rescue => e
       end
     end
     wrapper = '"'
@@ -272,7 +272,7 @@ class Import < ActiveRecord::Base
     if file_exists?
       begin
         File.delete filepath
-      rescue Exception => e
+      rescue => e
         logger.error "Unable to delete file #{filepath}: #{e.message}" if logger
       end
     end
diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index 8b5d7133f..ef7ef429d 100755
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -53,7 +53,7 @@ class MailHandler < ActionMailer::Base
   # Receives an email and rescues any exception
   def self.safe_receive(*args)
     receive(*args)
-  rescue Exception => e
+  rescue => e
     Rails.logger.error "MailHandler: an unexpected error occurred when receiving email: #{e.message}"
     return false
   end
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index c0a30d35a..8ab43e9b6 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -705,7 +705,7 @@ class Mailer < ActionMailer::Base
       # Log errors when raise_delivery_errors is set to false, Rails does not
       mail.raise_delivery_errors = true
       super
-    rescue Exception => e
+    rescue => e
       if ActionMailer::Base.raise_delivery_errors
         raise e
       else
diff --git a/app/models/query.rb b/app/models/query.rb
index 6dea88c78..f5f929b30 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -327,7 +327,7 @@ class Query < ActiveRecord::Base
     if self == ::Query
       # Visibility depends on permissions for each subclass,
       # raise an error if the scope is called from Query (eg. Query.visible)
-      raise Exception.new("Cannot call .visible scope from the base Query class, but from subclasses only.")
+      raise "Cannot call .visible scope from the base Query class, but from subclasses only."
     end
 
     user = args.shift || User.current
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 0284e1b29..7da99faa3 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -382,7 +382,7 @@ class Repository < ActiveRecord::Base
     ret = ""
     begin
       ret = self.scm_adapter_class.client_command if self.scm_adapter_class
-    rescue Exception => e
+    rescue => e
       logger.error "scm: error during get command: #{e.message}"
     end
     ret
@@ -392,7 +392,7 @@ class Repository < ActiveRecord::Base
     ret = ""
     begin
       ret = self.scm_adapter_class.client_version_string if self.scm_adapter_class
-    rescue Exception => e
+    rescue => e
       logger.error "scm: error during get version string: #{e.message}"
     end
     ret
@@ -402,7 +402,7 @@ class Repository < ActiveRecord::Base
     ret = false
     begin
       ret = self.scm_adapter_class.client_available if self.scm_adapter_class
-    rescue Exception => e
+    rescue => e
       logger.error "scm: error during get scm available: #{e.message}"
     end
     ret
diff --git a/app/models/repository/git.rb b/app/models/repository/git.rb
index a8c5efd33..6cff4507d 100644
--- a/app/models/repository/git.rb
+++ b/app/models/repository/git.rb
@@ -84,7 +84,7 @@ class Repository::Git < Repository
 
   def default_branch
     scm.default_branch
-  rescue Exception => e
+  rescue => e
     logger.error "git: error during get default branch: #{e.message}"
     nil
   end
diff --git a/app/models/tracker.rb b/app/models/tracker.rb
index 088ad3948..aeb86ca9e 100644
--- a/app/models/tracker.rb
+++ b/app/models/tracker.rb
@@ -142,6 +142,6 @@ class Tracker < ActiveRecord::Base
 
 private
   def check_integrity
-    raise Exception.new("Cannot delete tracker") if Issue.where(:tracker_id => self.id).any?
+    raise "Cannot delete tracker" if Issue.where(:tracker_id => self.id).any?
   end
 end