Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Allow JRuby users to use pure ruby reactor #391

Merged
merged 1 commit into from

2 participants

@JoshuaOSHickman

I just reversed the order of the conditional load checks so that it's possible to use either reactor on jruby.

@tmm1 tmm1 merged commit d7c8a14 into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 19, 2012
This page is out of date. Refresh to see the latest.
Showing with 3 additions and 3 deletions.
  1. +3 −3 lib/eventmachine.rb
View
6 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'
Something went wrong with that request. Please try again.