tarui	2010-06-22 02:02:29 +0900 (Tue, 22 Jun 2010)

  New Revision: 28373

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

  Log:
    merge from trunk (r28316)
    
    * lib/drb/drb.rb: raise DRbConnError instead of ArgumentError if too
      many arguments. [ruby-dev:41481]
    
    * test/drb/test_drb.rb: ditto.
    
    * test/drb/drbtest.rb: ditto.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/lib/drb/drb.rb
    branches/ruby_1_9_2/test/drb/drbtest.rb
    branches/ruby_1_9_2/test/drb/test_drb.rb

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28372)
+++ ruby_1_9_2/ChangeLog	(revision 28373)
@@ -1,3 +1,12 @@
+Tue Jun 22 01:38:23 2010  Masatoshi SEKI  <m_seki@m...>
+
+	* lib/drb/drb.rb: raise DRbConnError instead of ArgumentError if too
+	  many arguments. [ruby-dev:41481]
+
+	* test/drb/test_drb.rb: ditto.
+
+	* test/drb/drbtest.rb: ditto.
+
 Tue Jun 22 00:57:57 2010  Yusuke Endoh  <mame@t...>
 
 	* lib/webrick/httpservlet/filehandler.rb
Index: ruby_1_9_2/lib/drb/drb.rb
===================================================================
--- ruby_1_9_2/lib/drb/drb.rb	(revision 28372)
+++ ruby_1_9_2/lib/drb/drb.rb	(revision 28373)
@@ -613,7 +613,7 @@
       ro = DRb.to_obj(ref)
       msg = load(stream)
       argc = load(stream)
-      raise ArgumentError, 'too many arguments' if @argc_limit < argc
+      raise(DRbConnError, "too many arguments") if @argc_limit < argc
       argv = Array.new(argc, nil)
       argc.times do |n|
 	argv[n] = load(stream)
Index: ruby_1_9_2/test/drb/test_drb.rb
===================================================================
--- ruby_1_9_2/test/drb/test_drb.rb	(revision 28372)
+++ ruby_1_9_2/test/drb/test_drb.rb	(revision 28373)
@@ -283,7 +283,7 @@
   end
 
   def test_04_many_arg
-    assert_raise(ArgumentError) {
+    assert_raise(DRb::DRbConnError) {
       @there.arg_test(1, 2, 3, 4, 5, 6, 7, 8, 9, 0)
     }
   end
Index: ruby_1_9_2/test/drb/drbtest.rb
===================================================================
--- ruby_1_9_2/test/drb/drbtest.rb	(revision 28372)
+++ ruby_1_9_2/test/drb/drbtest.rb	(revision 28373)
@@ -135,7 +135,7 @@
 
   def test_03
     assert_equal(8, @there.sum(1, 1, 1, 1, 1, 1, 1, 1))
-    assert_raise(ArgumentError) do
+    assert_raise(DRb::DRbConnError) do
       @there.sum(1, 1, 1, 1, 1, 1, 1, 1, 1)
     end
     assert_raise(DRb::DRbConnError) do

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