Merge branch 'copyright'

[rails.git] / config / initializers / abstract_adapter.rb

diff --git a/config/initializers/abstract_adapter.rb b/config/initializers/abstract_adapter.rb
index 24d7c56e1b5843480473011573b596d04ec2cb08..5cc24d25c38489183a869661f7f3c68db3227a83 100644 (file)
--- a/config/initializers/abstract_adapter.rb
+++ b/config/initializers/abstract_adapter.rb
@@ -15,6 +15,8 @@ module ActiveRecord
       rescue ActiveRecord::StatementInvalid => ex
         if ex.message =~ /^OSM::APITimeoutError: /
           raise OSM::APITimeoutError.new
+        elsif ex.message =~ /^Timeout::Error: /
+          raise Timeout::Error.new("time's up!")
         else
           raise
         end