summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Dingwell <bobd@mitre.org>2011-12-05 11:28:01 -0500
committerRobert Dingwell <bobd@mitre.org>2011-12-05 11:28:01 -0500
commitac2128d9cdfbc0354a99c6b94745652df2dddf5f (patch)
treeed7d25e390cd8b8dae7d95b24853b352d00740e3
parent6e0b90b18a1733ce5fc35215c4b34a843c9e741a (diff)
downloadsystemu-ac2128d9cdfbc0354a99c6b94745652df2dddf5f.tar.gz
changing JRuby import statement to java_import. This is done to allow the use of systemu with JRuby and Rake. Rake and JRuby have conflicting import statements
-rw-r--r--lib/systemu.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/systemu.rb b/lib/systemu.rb
index 9121367..e4fc680 100644
--- a/lib/systemu.rb
+++ b/lib/systemu.rb
@@ -259,7 +259,7 @@ end
# some monkeypatching for JRuby
if defined? JRUBY_VERSION
require 'jruby'
- import org.jruby.RubyProcess
+ java_import org.jruby.RubyProcess
class SystemUniversal
def systemu