Merge
authormichaelm
Thu, 16 May 2013 17:31:41 +0100
changeset 17486 8708a3d0279d
parent 17485 feb8cd6a4c7d (current diff)
parent 17484 4ad440adc4b1 (diff)
child 17488 1640e9deb320
Merge
--- a/jdk/src/share/classes/com/sun/tools/jdi/AbstractLauncher.java	Thu May 16 17:28:47 2013 +0100
+++ b/jdk/src/share/classes/com/sun/tools/jdi/AbstractLauncher.java	Thu May 16 17:31:41 2013 +0100
@@ -142,7 +142,7 @@
      * This class simply provides a context for a single launch and
      * accept. It provides instance fields that can be used by
      * all threads involved. This stuff can't be in the Connector proper
-     * because the connector is is a singleton and not specific to any
+     * because the connector is a singleton and is not specific to any
      * one launch.
      */
     private class Helper {
--- a/jdk/src/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java	Thu May 16 17:28:47 2013 +0100
+++ b/jdk/src/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java	Thu May 16 17:31:41 2013 +0100
@@ -213,7 +213,7 @@
                 exePath = exe;
             }
             // Quote only if necessary in case the quote arg value is bogus
-            if (hasWhitespace(exe)) {
+            if (hasWhitespace(exePath)) {
                 exePath = quote + exePath + quote;
             }