Require java extensions on JRuby

Author: pitr-ch

Rakefile

@@ -3,7 +3,6 @@
 $:.push File.join(File.dirname(__FILE__), 'lib')
 
 require 'concurrent/version'
-require 'concurrent/synchronization'
 require 'concurrent/utility/native_extension_loader'
 
 ## load the gemspec files

lib/concurrent/map.rb

@@ -1,6 +1,7 @@
 require 'thread'
 require 'concurrent/constants'
 require 'concurrent/utility/native_extension_loader'
+Concurrent.load_native_extensions
 
 module Concurrent
   # @!visibility private

lib/concurrent/synchronization.rb

@@ -2,6 +2,7 @@
 
 require 'concurrent/synchronization/abstract_object'
 require 'concurrent/utility/native_extension_loader' # load native parts first
+Concurrent.load_native_extensions
 
 require 'concurrent/synchronization/mri_object'
 require 'concurrent/synchronization/jruby_object'

lib/concurrent/synchronization/lockable_object.rb

@@ -8,7 +8,7 @@ module Synchronization
                                      MriMonitorLockableObject
                                    when Concurrent.on_cruby? && Concurrent.ruby_version(:>, 1, 9, 3)
                                      MriMutexLockableObject
-                                   when defined? JRubyLockableObject
+                                   when Concurrent.on_jruby?
                                      JRubyLockableObject
                                    when Concurrent.on_rbx? || Concurrent.on_truffle?
                                      RbxLockableObject

lib/concurrent/synchronization/object.rb

@@ -6,7 +6,7 @@ module Synchronization
     ObjectImplementation = case
                            when Concurrent.on_cruby?
                              MriObject
-                           when defined? JRubyObject
+                           when Concurrent.on_jruby?
                              JRubyObject
                            when Concurrent.on_rbx? || Concurrent.on_truffle?
                              RbxObject

lib/concurrent/synchronization/volatile.rb

@@ -25,11 +25,10 @@ module Synchronization
       MriAttrVolatile
     when Concurrent.on_jruby?
       JRubyAttrVolatile
-    when Concurrent.on_rbx?
+    when Concurrent.on_rbx? || Concurrent.on_truffle?
       RbxAttrVolatile
     else
-      warn 'Possibly unsupported Ruby implementation'
       MriAttrVolatile
     end
   end
-end
+end

lib/concurrent/utility/native_extension_loader.rb

@@ -2,10 +2,6 @@
 
 module Concurrent
 
-  unless defined? Synchronization::AbstractObject
-    raise 'native_extension_loader loaded before Synchronization::AbstractObject'
-  end
-
   module Utility
 
     # @!visibility private
@@ -32,6 +28,10 @@ def set_java_extensions_loaded
       end
 
       def load_native_extensions
+        unless defined? Synchronization::AbstractObject
+          raise 'native_extension_loader loaded before Synchronization::AbstractObject'
+        end
+
         if Concurrent.on_cruby? && !c_extensions_loaded?
           tries = [
             lambda do
@@ -60,7 +60,7 @@ def load_native_extensions
             set_java_extensions_loaded
           rescue LoadError
             # move on with pure-Ruby implementations
-            warn 'On JRuby but Java extensions failed to load.'
+            raise 'On JRuby but Java extensions failed to load.'
           end
         end
       end
@@ -71,4 +71,3 @@ def load_native_extensions
   extend Utility::NativeExtensionLoader
 end
 
-Concurrent.load_native_extensions