diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-07-28 09:05:08 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-07-28 09:05:08 +0000 |
commit | 1bd47bf0bc2051affae12a3a420abf2b44660389 (patch) | |
tree | 63ed0fbf16472b877b72e67921bb0463fe9493b6 /lib/drb | |
parent | 3f1f17c8c5f3e30e33e904b3c77502bfa5718a5b (diff) |
* eval.c (rb_call0): should call rb_call_super() directly for
visibility overriding. [ruby-dev:23989]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6714 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/drb')
-rw-r--r-- | lib/drb/drb.rb | 4 | ||||
-rw-r--r-- | lib/drb/invokemethod.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb index 8919a946b9..eb2d0d1459 100644 --- a/lib/drb/drb.rb +++ b/lib/drb/drb.rb @@ -564,7 +564,7 @@ module DRb rescue raise(DRbConnError, $!.message, $!.backtrace) end - raise(DRbConnError, 'connection closed') if sz.nil? + raise(DRbConnError, 'connection closed') if str.nil? raise(DRbConnError, 'premature marshal format(can\'t read)') if str.size < sz begin Marshal::load(str) @@ -1395,7 +1395,7 @@ module DRb @result = perform_without_block end @succ = true - if @msg_id == :to_ary && @result.class == Values + if @msg_id == :to_ary @result = DRbArray.new(@result) end return @succ, @result diff --git a/lib/drb/invokemethod.rb b/lib/drb/invokemethod.rb index 7cea01707f..a59b41d0a0 100644 --- a/lib/drb/invokemethod.rb +++ b/lib/drb/invokemethod.rb @@ -9,7 +9,7 @@ module DRb end block_value = @block.call(*x) end - + def perform_with_block @obj.__send__(@msg_id, *@argv) do |*x| jump_error = nil |