Skip to content

Commit a7a0b37

Browse files
committed
The java extension is non-optional
1 parent 1bd4a48 commit a7a0b37

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

lib/concurrent-ruby/concurrent/synchronization/jruby_lockable_object.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
require 'concurrent/utility/native_extension_loader' # load native parts first
2+
13
module Concurrent
24
module Synchronization
35

4-
if Concurrent.on_jruby? && Concurrent.java_extensions_loaded?
6+
if Concurrent.on_jruby?
57

68
# @!visibility private
79
# @!macro internal_implementation_note

lib/concurrent-ruby/concurrent/utility/native_extension_loader.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ def c_extensions_loaded?
1515
defined?(@c_extensions_loaded) && @c_extensions_loaded
1616
end
1717

18-
def java_extensions_loaded?
19-
defined?(@java_extensions_loaded) && @java_extensions_loaded
20-
end
21-
2218
def load_native_extensions
2319
if Concurrent.on_cruby? && !c_extensions_loaded?
2420
['concurrent/concurrent_ruby_ext',
@@ -50,6 +46,10 @@ def set_c_extensions_loaded
5046
@c_extensions_loaded = true
5147
end
5248

49+
def java_extensions_loaded?
50+
defined?(@java_extensions_loaded) && @java_extensions_loaded
51+
end
52+
5353
def set_java_extensions_loaded
5454
@java_extensions_loaded = true
5555
end

0 commit comments

Comments
 (0)