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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28373 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 12 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 02e26dda90..c650f9082c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Jun 22 01:38:23 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.
+
 Tue Jun 22 00:57:57 2010  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* lib/webrick/httpservlet/filehandler.rb
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 4712306fe0..84a21440ed 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 38e9b74155..a5222dec60 100644
--- a/test/drb/drbtest.rb
+++ b/test/drb/drbtest.rb
@@ -135,7 +135,7 @@ module DRbCore
 
   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
diff --git a/test/drb/test_drb.rb b/test/drb/test_drb.rb
index 293102333f..990cb825cf 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_raise(ArgumentError) {
+    assert_raise(DRb::DRbConnError) {
       @there.arg_test(1, 2, 3, 4, 5, 6, 7, 8, 9, 0)
     }
   end