From f87402c392623ec272e8d0b46845f9de67a5b961 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 8 Dec 2010 08:08:46 +0000 Subject: merges r29523 from trunk into ruby_1_9_2. -- * lib/net/http.rb (transport_request): @socket may be nil. patched by Egbert Eich [ruby-core:32829] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/net/http.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/net/http.rb b/lib/net/http.rb index d4329e53c3..5407975851 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -1189,7 +1189,7 @@ module Net #:nodoc: res rescue => exception D "Conn close because of error #{exception}" - @socket.close unless @socket.closed? + @socket.close if @socket and not @socket.closed? raise exception end -- cgit v1.2.3