From 0418aab850ed1a86ea5e72945025192034439a4d Mon Sep 17 00:00:00 2001
From: tarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 21 Jun 2010 17:02:29 +0000
Subject: 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
---
 lib/drb/drb.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

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)
-- 
cgit v1.2.3