summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authortarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-21 17:02:29 +0000
committertarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-21 17:02:29 +0000
commit0418aab850ed1a86ea5e72945025192034439a4d (patch)
treec6ffa2dea2db25db14f4224f05f7936af3f7f3d0 /lib
parentb808fcae8f9af5e4df622674e5692c6c416ac6d4 (diff)
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
Diffstat (limited to 'lib')
-rw-r--r--lib/drb/drb.rb2
1 files changed, 1 insertions, 1 deletions
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)