Fix JRUBY-6016: JRuby 1.6.3 does not respect JAVA_MEM

Author: BanzaiMan

argparser.cpp

@@ -230,6 +230,11 @@ bool ArgParser::parseArgs(int argc, char *argv[]) {
         noBootClassPath = true;
     }
 
+    const char *java_mem = getenv("JAVA_MEM");
+    if (java_mem != NULL) {
+        javaOptions.push_back(java_mem);
+    }
+
     addToArgList(args, argc, argv);
 
     logMsg("Parsing arguments:");

spec/launcher_spec.rb

@@ -196,6 +196,13 @@
       end
   end
 
+  # JRUBY-6016
+  it "should honor JAVA_MEM" do
+    with_environment "JAVA_MEM" => "-Xmx768m" do
+      jruby_launcher_args("").should include("-Xmx768m", "-Djruby.memory.max=768m")
+    end
+  end
+
   it "should print the version" do
     jruby_launcher("-Xversion 2>&1").should =~ /Launcher Version [0-9.]+/
   end