From 36c13a6d55b10afd2b16489c90f752e78d474eae Mon Sep 17 00:00:00 2001
From: seki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 14 Jun 2010 09:34:43 +0000
Subject: [PATCH] raise DRbConnError instead of ArgumentError if too many
 arguments. [ruby-dev:41481]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28317 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog            | 9 +++++++++
 lib/drb/drb.rb       | 2 +-
 test/drb/drbtest.rb  | 2 +-
 test/drb/test_drb.rb | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 030fbf3cd9..ea674dfdf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Jun 14 18:32:38 2010  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* 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@ruby-lang.org>
 
 	* io.c (rb_f_syscall): should check argument string taint before
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 90a68d831e..fc95637049 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -613,7 +613,7 @@ module DRb
       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)
diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb
index e0268e38e7..326b09676b 100644
--- a/test/drb/drbtest.rb
+++ b/test/drb/drbtest.rb
@@ -141,7 +141,7 @@ module DRbCore
 
   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
diff --git a/test/drb/test_drb.rb b/test/drb/test_drb.rb
index 394803d159..38e6a8e9cd 100644
--- a/test/drb/test_drb.rb
+++ b/test/drb/test_drb.rb
@@ -283,7 +283,7 @@ class TestDRbLarge < Test::Unit::TestCase
   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