jruby.rb in aruba-0.9.0.pre

- old
+ new

@@ -4,11 +4,14 @@
 Aruba.configure do |config|
   config.before :command do
     next unless RUBY_PLATFORM == 'java'
 
     # disable JIT since these processes are so short lived
-    ENV['JRUBY_OPTS'] = "-X-C #{ENV['JRUBY_OPTS']}"
+    ENV['JRUBY_OPTS'] = "-X-C #{ENV['JRUBY_OPTS']}" unless ENV['JRUBY_OPTS'].include? '-X-C'
 
+    # Faster startup for jruby
+    ENV['JRUBY_OPTS'] = "--dev #{ENV['JRUBY_OPTS']}"  unless ENV['JRUBY_OPTS'].include? '--dev'
+
     # force jRuby to use client JVM for faster startup times
-    ENV['JAVA_OPTS'] = "-d32 #{ENV['JAVA_OPTS']}" if RbConfig::CONFIG['host_os'] =~ /solaris|sunos/i
+    ENV['JAVA_OPTS'] = "-d32 #{ENV['JAVA_OPTS']}" if RbConfig::CONFIG['host_os'] =~ /solaris|sunos/i && !ENV['JAVA_OPTS'].include?('-d32')
   end
 end