diff options
| author | seki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-12 11:07:29 +0000 |
|---|---|---|
| committer | seki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-12 11:07:29 +0000 |
| commit | 91d0b9fb4dbc24c122256995523c95c93723fa17 (patch) | |
| tree | 03f564983080872877d911b246d5a58e94478d03 | |
| parent | f0ca3f331572ebab6dac4a7abaefdc49e086545e (diff) | |
| download | ruby-91d0b9fb4dbc24c122256995523c95c93723fa17.tar.gz ruby-91d0b9fb4dbc24c122256995523c95c93723fa17.tar.xz ruby-91d0b9fb4dbc24c122256995523c95c93723fa17.zip | |
backported from CVS_HEAD
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/drb/drb.rb | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Sun Dec 12 20:06:38 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> + + * lib/drb/drb.rb: backported from CVS HEAD. + Sun Dec 12 10:35:10 2004 Dave Thomas <dave@pragprog.com> * lib/rdoc/generators/template/html/html.rb (RDoc::Page): Don't diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb index e92131f1d..f3ed778da 100644 --- a/lib/drb/drb.rb +++ b/lib/drb/drb.rb @@ -461,7 +461,7 @@ module DRb # when the unmarshalling failed. It is used to determine the # name of the unmarshalled object. def initialize(err, buf) - case err + case err.to_s when /uninitialized constant (\S+)/ @name = $1 when /undefined class\/module (\S+)/ @@ -573,7 +573,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) |