diff options
| author | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-20 03:56:51 +0000 |
|---|---|---|
| committer | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-20 03:56:51 +0000 |
| commit | 0dfc5918ec19cb67d8a49915ad8ab177f56e4e73 (patch) | |
| tree | bcf6a376e13dd981a73be23d7e8aa8b3b8dd8557 /lib/monitor.rb | |
| parent | 312fc605c1e09c487f66c13fdbcf6bfff44d8b7f (diff) | |
revert r65822
Because mon_initialized may be used to re-initialize copied objects intentionally.
mon_initialize_spec.rb fails:
1)
MonitorMixin#mon_initialize can be called in initialize_copy to get a new Mutex and used with synchronize ERROR
ThreadError: already initialized
/home/shugo/src/ruby/lib/monitor.rb:255:in `mon_initialize'
/home/shugo/src/ruby/spec/ruby/library/monitor/mon_initialize_spec.rb:19:in `initialize_copy'
/home/shugo/src/ruby/spec/ruby/library/monitor/mon_initialize_spec.rb:28:in `initialize_dup'
/home/shugo/src/ruby/spec/ruby/library/monitor/mon_initialize_spec.rb:28:in `dup'
/home/shugo/src/ruby/spec/ruby/library/monitor/mon_initialize_spec.rb:28:in `block (2 levels) in <top (required)>'
/home/shugo/src/ruby/spec/ruby/library/monitor/mon_initialize_spec.rb:4:in `<top (required)>'
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/monitor.rb')
| -rw-r--r-- | lib/monitor.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/monitor.rb b/lib/monitor.rb index 86c779f184..288ed755ea 100644 --- a/lib/monitor.rb +++ b/lib/monitor.rb @@ -251,12 +251,9 @@ module MonitorMixin # Initializes the MonitorMixin after being included in a class or when an # object has been extended with the MonitorMixin def mon_initialize - if defined?(@mon_mutex) - raise ThreadError, "already initialized" - end - @mon_mutex = Thread::Mutex.new @mon_owner = nil @mon_count = 0 + @mon_mutex = Thread::Mutex.new end def mon_check_owner |