Merge branch 'jruby-1_7'

jruby · Jul 27, 2015 · 3d56dd3 · 3d56dd3
2 parents a8b4016 + cde5bbb
commit 3d56dd3
Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/core/src/main/java/org/jruby/java/dispatch/CallableSelector.java b/core/src/main/java/org/jruby/java/dispatch/CallableSelector.java
@@ -245,8 +245,8 @@ else if ( procArity < 0 && methodArity >= -(procArity + 1) ) { // *splat that fi
                                             mostSpecific = candidate; msTypes = cTypes;
                                             mostSpecificArity = methodArity; // ambiguous = false;
                                         }
+                                        ambiguous = false;
                                     }
-                                    ambiguous = false;
                                     continue; /* OUTER */
                                 }
                             }

diff --git a/core/src/main/java/org/jruby/util/ShellLauncher.java b/core/src/main/java/org/jruby/util/ShellLauncher.java
@@ -1262,11 +1262,6 @@ public void verifyExecutableForShell() {
             execArgs[0] = shell;
             execArgs[1] = shell.endsWith("sh") ? "-c" : "/c";
 
-            // HACK to get the builtin command right
-            if (cmdline.startsWith("\"java -cp") && cmdline.contains("org.jruby.Main\"")) {
-                cmdline = cmdline.replace("\"java -cp", "java -cp")
-                        .replace("org.jruby.Main\"", "org.jruby.Main");
-            }
             if (Platform.IS_WINDOWS) {
                 // that's how MRI does it too
                 execArgs[2] = "\"" + cmdline + "\"";

diff --git a/lib/ruby/stdlib/rubygems/defaults/jruby.rb b/lib/ruby/stdlib/rubygems/defaults/jruby.rb
@@ -12,8 +12,7 @@ class << self
     def ruby
       ruby_path = original_ruby
       if jarred_path?(ruby_path)
-        # use quote as the original_ruby does it
-        ruby_path = "\"#{org.jruby.util.ClasspathLauncher.jrubyCommand(JRuby.runtime)}\""
+        ruby_path = "#{org.jruby.util.ClasspathLauncher.jrubyCommand(JRuby.runtime)}"
       end
       ruby_path
     end