diff options
| -rw-r--r-- | lib/monitor.rb | 5 | ||||
| -rw-r--r-- | test/monitor/test_monitor_mixin.rb | 37 |
2 files changed, 1 insertions, 41 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 diff --git a/test/monitor/test_monitor_mixin.rb b/test/monitor/test_monitor_mixin.rb deleted file mode 100644 index 24ad6b78f3..0000000000 --- a/test/monitor/test_monitor_mixin.rb +++ /dev/null @@ -1,37 +0,0 @@ -# frozen_string_literal: false -require 'test/unit' -require 'monitor' - -class TestMonitorMixin < Test::Unit::TestCase - def test_cond - a = "foo" - a.extend(MonitorMixin) - cond = a.new_cond - queue1 = Queue.new - th = Thread.start do - queue1.deq - a.synchronize do - a.replace("bar") - cond.signal - end - end - th2 = Thread.start do - a.synchronize do - queue1.enq(nil) - assert_equal("foo", a) - result1 = cond.wait - assert_equal(true, result1) - assert_equal("bar", a) - end - end - assert_join_threads([th, th2]) - end - - def test_initialize_twice - a = Object.new - a.extend(MonitorMixin) - assert_raise(ThreadError) do - a.send(:mon_initialize) - end - end -end |