# HG changeset patch
# User Stefan Anzinger <stefan.anzinger@oracle.com>
# Date 1411769642 25200
# Node ID d1cc47f5b1dda7c4c11ecd16b849aa93db9df305
# Parent  45c8f71196ecc09c70d293c1301fb146a0730f8a# Parent  9d728eb7fdecc14427454d4bba7cd4c06f3f15c6
Merge

diff -r 45c8f71196ec -r d1cc47f5b1dd mxtool/mx.py
--- a/mxtool/mx.py	Fri Sep 26 10:41:19 2014 -0700
+++ b/mxtool/mx.py	Fri Sep 26 15:14:02 2014 -0700
@@ -2136,13 +2136,13 @@
             self._init_classpaths()
 
         for e in self._bootclasspath.split(os.pathsep):
-            if basename(e) == self.jar:
+            if basename(e) == jar:
                 return True
         for d in self._extdirs.split(os.pathsep):
-            if len(d) and self.jar in os.listdir(d):
+            if len(d) and jar in os.listdir(d):
                 return True
         for d in self._endorseddirs.split(os.pathsep):
-            if len(d) and self.jar in os.listdir(d):
+            if len(d) and jar in os.listdir(d):
                 return True
         return False
 
@@ -2382,7 +2382,7 @@
             else:
                 self.logCompilation('JDT')
 
-                jdtVmArgs = ['-Xmx1g', '-jar', self.jdtJar]
+                jdtVmArgs = ['-Xmx1g', '-jar', _tpU2W(self.jdtJar)]
 
                 jdtArgs = ['-' + compliance,
                          '-cp', cp, '-g', '-enableJavadoc',
@@ -2415,7 +2415,7 @@
                         jdtArgs += ['-properties', jdtPropertiesTmp]
                     else:
                         jdtArgs += ['-properties', jdtProperties]
-                jdtArgs.append('@' + argfile.name)
+                jdtArgs.append('@' + _tpU2W(argfile.name))
 
                 run_java(jdtVmArgs + jdtArgs)