diff options
| author | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-12 22:24:32 +0000 |
|---|---|---|
| committer | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-12 22:24:32 +0000 |
| commit | f71ecc7e388dcd3fd962a5cbb4e0786b938865e8 (patch) | |
| tree | 65238d86c0edc8bec2493e3d04f19796a754eab5 | |
| parent | 262c3c948a1f2aaf9c1610f13ccfc4d4fc93025a (diff) | |
| download | ruby-f71ecc7e388dcd3fd962a5cbb4e0786b938865e8.tar.gz ruby-f71ecc7e388dcd3fd962a5cbb4e0786b938865e8.tar.xz ruby-f71ecc7e388dcd3fd962a5cbb4e0786b938865e8.zip | |
* lib/monitor.rb (mon_try_enter): call @mon_muetx.try_lock.
Thanks, Keiju ISHITSUKA. [ruby-dev:30507]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@12058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/monitor.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Mar 13 07:23:20 2007 Shugo Maeda <shugo@ruby-lang.org> + + * lib/monitor.rb (mon_try_enter): call @mon_muetx.try_lock. + Thanks, Keiju ISHITSUKA. [ruby-dev:30507] + Tue Mar 13 02:42:58 2007 Akinori MUSHA <knu@iDaemons.org> * lib/cgi.rb (CGI::header): IIS >= 5.0 does not need the nph diff --git a/lib/monitor.rb b/lib/monitor.rb index b55674757..4d31dca41 100644 --- a/lib/monitor.rb +++ b/lib/monitor.rb @@ -145,7 +145,7 @@ module MonitorMixin # def mon_try_enter if @mon_owner != Thread.current - unless @mon_owner.trylock + unless @mon_mutex.try_lock return false end @mon_owner = Thread.current |