seki	2010-06-14 18:34:43 +0900 (Mon, 14 Jun 2010)

  New Revision: 28317

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

  Log:
    raise DRbConnError instead of ArgumentError if too many arguments.
    [ruby-dev:41481]

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

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 28316)
+++ ruby_1_8/ChangeLog	(revision 28317)
@@ -1,3 +1,12 @@
+Mon Jun 14 18:32:38 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.
+
 Sat Jun 12 10:02:26 2010  Yukihiro Matsumoto  <matz@r...>
 
 	* io.c (rb_f_syscall): should check argument string taint before
Index: ruby_1_8/lib/drb/drb.rb
===================================================================
--- ruby_1_8/lib/drb/drb.rb	(revision 28316)
+++ ruby_1_8/lib/drb/drb.rb	(revision 28317)
@@ -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_8/test/drb/test_drb.rb
===================================================================
--- ruby_1_8/test/drb/test_drb.rb	(revision 28316)
+++ ruby_1_8/test/drb/test_drb.rb	(revision 28317)
@@ -283,7 +283,7 @@
   end
 
   def test_04_many_arg
-    assert_raises(ArgumentError) {
+    assert_raises(DRb::DRbConnError) {
       @there.arg_test(1, 2, 3, 4, 5, 6, 7, 8, 9, 0)
     }
   end
Index: ruby_1_8/test/drb/drbtest.rb
===================================================================
--- ruby_1_8/test/drb/drbtest.rb	(revision 28316)
+++ ruby_1_8/test/drb/drbtest.rb	(revision 28317)
@@ -141,7 +141,7 @@
 
   def test_03
     assert_equal(8, @there.sum(1, 1, 1, 1, 1, 1, 1, 1))
-    assert_raises(ArgumentError) do
+    assert_raises(DRb::DRbConnError) do
       @there.sum(1, 1, 1, 1, 1, 1, 1, 1, 1)
     end
     assert_raises(DRb::DRbConnError) do

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