From 2fc9a73a237cd1e654fb67f2467e2bcdcebfdc69 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 16 Jul 2009 10:04:17 +0000
Subject: 	* ext/socket/lib/socket.rb (Socket.tcp_server_sockets_port0):
 servers 	  is nil if an error occurs before setting it.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24152 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                | 5 +++++
 ext/socket/lib/socket.rb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 4d3f33248..716d7633e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 16 19:02:28 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/lib/socket.rb (Socket.tcp_server_sockets_port0): servers
+	  is nil if an error occurs before setting it.
+
 Thu Jul 16 18:42:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* random.c (fill_random_seed): suppress a warning.
diff --git a/ext/socket/lib/socket.rb b/ext/socket/lib/socket.rb
index b12fc4a76..8d417487e 100644
--- a/ext/socket/lib/socket.rb
+++ b/ext/socket/lib/socket.rb
@@ -312,7 +312,7 @@ class Socket
     }
     sockets
   ensure
-    sockets.each {|s| s.close if !s.closed? } if $!
+    sockets.each {|s| s.close if !s.closed? } if $! && sockets
   end
   class << self
     private :tcp_server_sockets_port0
-- 
cgit