Skip to content

Commit 469d1c3

Browse files
committed
Merge pull request #472 from reidmorrison/master
Fixes #471 uninitialized constant Concurrent::ReentrantReadWriteLock
2 parents b02c90a + dfce587 commit 469d1c3

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

lib/concurrent/atomics.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,6 @@
4848
require 'concurrent/atomic/count_down_latch'
4949
require 'concurrent/atomic/event'
5050
require 'concurrent/atomic/read_write_lock'
51+
require 'concurrent/atomic/reentrant_read_write_lock'
5152
require 'concurrent/atomic/semaphore'
5253
require 'concurrent/atomic/thread_local_var'

spec/concurrent/atomic/reentrant_read_write_lock_spec.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
# long as `ReentrantReadWriteLock` is not changed (with respect to
1010
# `ThreadLocalVar`) we can safely assume proper functionality on JRuby.
1111

12-
require 'concurrent/atomic/reentrant_read_write_lock'
13-
require 'concurrent/atomic/count_down_latch'
1412
require 'timeout'
1513

1614
module Concurrent

0 commit comments

Comments
 (0)