From d6690e017ea20c25d43ba03bd0577c978289b31d Mon Sep 17 00:00:00 2001 From: Orion Hickman Date: Wed, 19 Dec 2012 11:10:21 -0800 Subject: [PATCH] allow jruby users to opt out of the Java EventMachine reactor --- lib/eventmachine.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/eventmachine.rb b/lib/eventmachine.rb index 4e02bea11..93c2eee41 100644 --- 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'