find tools.jar even if it is distributed with the JRE, submitted by Nick Crossley, PR 38500

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@392037 13f79535-47bb-0310-9956-ffa450edef68

contributors.xml

@@ -666,6 +666,10 @@
     <first>Nick</first>
     <last>Chalko</last>
   </name>
+  <name>
+    <first>Nick</first>
+    <last>Crossley</last>
+  </name>
   <name>
     <first>Nick</first>
     <last>Fortescue</last>

src/main/org/apache/tools/ant/launch/Locator.java

@@ -339,10 +339,15 @@ public final class Locator {
         // couldn't find compiler - try to find tools.jar
         // based on java.home setting
         String javaHome = System.getProperty("java.home");
+        File toolsJar = new File(javaHome + "/lib/tools.jar");
+        if (toolsJar.exists()) {
+        	// Found in java.home as given
+        	return toolsJar;
+        }
         if (javaHome.toLowerCase(Locale.US).endsWith(File.separator + "jre")) {
             javaHome = javaHome.substring(0, javaHome.length() - 4);
+            toolsJar = new File(javaHome + "/lib/tools.jar");
         }
-        File toolsJar = new File(javaHome + "/lib/tools.jar");
         if (!toolsJar.exists()) {
             System.out.println("Unable to locate tools.jar. "
                  + "Expected to find it in " + toolsJar.getPath());