diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-12-31 15:02:22 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-12-31 15:02:22 +0000 |
commit | a3e1b1ce7ed7e7ffac23015fc2fde56511b30681 (patch) | |
tree | 7b725552a9a4ded93849ca2faab1b257f7761790 /lib/drb/drb.rb | |
parent | 3e7566d8fb5138bb9cd647e5fdefc54fc9803509 (diff) |
* Merge YARV
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11439 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/drb/drb.rb')
-rw-r--r-- | lib/drb/drb.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb index 9690469e0c..d62fead596 100644 --- a/lib/drb/drb.rb +++ b/lib/drb/drb.rb @@ -578,7 +578,8 @@ module DRb end raise(DRbConnError, 'connection closed') if str.nil? raise(DRbConnError, 'premature marshal format(can\'t read)') if str.size < sz - Thread.exclusive do + # TODO: YARV doesn't have Thread.exclusive + #Thread.exclusive do begin save = Thread.current[:drb_untaint] Thread.current[:drb_untaint] = [] @@ -591,7 +592,7 @@ module DRb end Thread.current[:drb_untaint] = save end - end + #end end def send_request(stream, ref, msg_id, arg, b) # :nodoc: @@ -1741,9 +1742,10 @@ module DRb @server = {} def regist_server(server) @server[server.uri] = server - Thread.exclusive do + # TODO: YARV doesn't have Thread.exclusive + #Thread.exclusive do @primary_server = server unless @primary_server - end + #end end module_function :regist_server |