yugui	2008-12-04 14:19:15 +0900 (Thu, 04 Dec 2008)

  New Revision: 20483

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20483

  Log:
    merges r20440 from trunk into ruby_1_9_1.
    * test/socket/test_tcp.rb (test_recvfrom, test_encoding): shouldn't assume
      that th is not nil.

  Modified files:
    branches/ruby_1_9_1/test/socket/test_tcp.rb

Index: ruby_1_9_1/test/socket/test_tcp.rb
===================================================================
--- ruby_1_9_1/test/socket/test_tcp.rb	(revision 20482)
+++ ruby_1_9_1/test/socket/test_tcp.rb	(revision 20483)
@@ -18,8 +18,8 @@
     sock = TCPSocket.open(addr[2], addr[1])
     assert_equal(["foo", nil], sock.recvfrom(0x10000))
   ensure
-    th.kill
-    th.join
+    th.kill if th
+    th.join if th
   end
 
   def test_encoding
@@ -36,8 +36,8 @@
     assert_equal("foo\r\n", s)
     assert_equal(Encoding.find("ASCII-8BIT"), s.encoding)
   ensure
-    th.kill
-    th.join
+    th.kill if th
+    th.join if th
     sock.close if sock
   end
 end if defined?(TCPSocket)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/