[前][次][番号順一覧][スレッド一覧]

ruby-changes:31438

From: akr <ko1@a...>
Date: Sun, 3 Nov 2013 20:27:04 +0900 (JST)
Subject: [ruby-changes:31438] akr:r43517 (trunk): * test/xmlrpc/webrick_testing.rb (stop_server): Don't try to shutdown

akr	2013-11-03 20:26:58 +0900 (Sun, 03 Nov 2013)

  New Revision: 43517

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

  Log:
    * test/xmlrpc/webrick_testing.rb (stop_server): Don't try to shutdown
      the server if the server is not started.

  Modified files:
    trunk/ChangeLog
    trunk/test/xmlrpc/webrick_testing.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 43516)
+++ ChangeLog	(revision 43517)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Nov  3 20:23:38 2013  Tanaka Akira  <akr@f...>
+
+	* test/xmlrpc/webrick_testing.rb (stop_server): Don't try to shutdown
+	  the server if the server is not started.
+
 Sun Nov  3 09:35:47 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* load.c (rb_feature_p): deal with default loadable suffixes.
Index: test/xmlrpc/webrick_testing.rb
===================================================================
--- test/xmlrpc/webrick_testing.rb	(revision 43516)
+++ test/xmlrpc/webrick_testing.rb	(revision 43517)
@@ -34,6 +34,7 @@ module WEBrick_Testing https://github.com/ruby/ruby/blob/trunk/test/xmlrpc/webrick_testing.rb#L34
   end
 
   def stop_server
+    return if !defined?(@__server) || !@__server
     Timeout.timeout(5) {
       @__server.shutdown
       Thread.pass while @__started # wait until the server is down

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

[前][次][番号順一覧][スレッド一覧]