Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #391 from JoshuaOSHickman/master

Allow JRuby users to use pure ruby reactor
  • Loading branch information...
commit d7c8a14dc494193a775add4b16c1e303cab5b285 2 parents 1aeb8a9 + d6690e0
@tmm1 tmm1 authored
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'
Please sign in to comment.
Something went wrong with that request. Please try again.