Merge pull request eventmachine#391 from JoshuaOSHickman/master

Allow JRuby users to use pure ruby reactor
snatchev · Dec 22, 2012 · d7c8a14 · d7c8a14
2 parents 1aeb8a9 + d6690e0
commit d7c8a14
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/eventmachine.rb b/lib/eventmachine.rb
@@ -1,8 +1,8 @@
-if RUBY_PLATFORM =~ /java/
+if defined?(EventMachine.library_type) and EventMachine.library_type == :pure_ruby
+  # assume 'em/pure_ruby' was loaded already
+elsif RUBY_PLATFORM =~ /java/
   require 'java'
   require 'jeventmachine'
-elsif defined?(EventMachine.library_type) and EventMachine.library_type == :pure_ruby
-  # assume 'em/pure_ruby' was loaded already
 else
   begin
     require 'rubyeventmachine'