From c4f2cc09fabeb40a85655e11e8f7179380aa30c0 Mon Sep 17 00:00:00 2001
From: Terence Lee <hone02@gmail.com>
Date: Tue, 31 Jul 2012 12:49:22 -0500
Subject: [PATCH] use openjdk7 and disable invoke dynamic in jruby

---
 lib/language_pack/ruby.rb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/language_pack/ruby.rb b/lib/language_pack/ruby.rb
index c977ce7..f55a3eb 100644
--- a/lib/language_pack/ruby.rb
+++ b/lib/language_pack/ruby.rb
@@ -12,7 +12,7 @@ class LanguagePack::Ruby < LanguagePack::Base
   NODE_VERSION        = "0.4.7"
   NODE_JS_BINARY_PATH = "node-#{NODE_VERSION}"
   JVM_BASE_URL        = "http://heroku-jvm-langpack-java.s3.amazonaws.com"
-  JVM_VERSION         = "openjdk6-latest"
+  JVM_VERSION         = "openjdk7-latest"
 
   # detects if this is a valid Ruby app
   # @return [Boolean] true if it's a Ruby app
@@ -35,7 +35,7 @@ def default_config_vars
       "GEM_PATH" => slug_vendor_base,
     }
 
-    ruby_version_jruby? ? vars.merge("JAVA_OPTS" => default_java_opts) : vars
+    ruby_version_jruby? ? vars.merge("JAVA_OPTS" => default_java_opts, "JRUBY_OPTS" => default_jruby_opts) : vars
   end
 
   def default_process_types
@@ -155,6 +155,12 @@ def default_java_opts
     "-Xmx384m -Xss512k -XX:+UseCompressedOops -Dfile.encoding=UTF-8"
   end
 
+  # default JRUBY_OPTS
+  # return [String] string of JRUBY_OPTS
+  def default_jruby_opts
+    "-Xcompile.invokedynamic=false"
+  end
+
   # list the available valid ruby versions
   # @note the value is memoized
   # @return [Array] list of Strings of the ruby versions available
@@ -190,6 +196,7 @@ def setup_profiled
 
     if ruby_version_jruby?
       set_env_default "JAVA_OPTS", default_java_opts
+      set_env_default "JRUBY_OPTS", default_jruby_opts
     end
   end