From 9ea68721ac32ed4d0868b7efaeae62d80fd180a3 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Mon, 26 Feb 2007 21:40:50 +0000 Subject: mysql.rb ignores IOError in finalizer when socket is already closed git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6241 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/vendor/mysql.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'activerecord/lib/active_record/vendor/mysql.rb') diff --git a/activerecord/lib/active_record/vendor/mysql.rb b/activerecord/lib/active_record/vendor/mysql.rb index 85ded2bc94..1c3294c719 100644 --- a/activerecord/lib/active_record/vendor/mysql.rb +++ b/activerecord/lib/active_record/vendor/mysql.rb @@ -1174,7 +1174,11 @@ class << Mysql def finalizer(net) proc { net.clear - net.write Mysql::COM_QUIT.chr + begin + net.write(Mysql::COM_QUIT.chr) + net.close + rescue # Ignore IOError if socket is already closed. + end } end -- cgit v1.2.3