From 4071974a6a470d7d5f6b6fba17c18be5f14ef028 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 6 Apr 2006 19:00:30 +0000
Subject: [PATCH] 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                                  | 4 ++++
 src/main/org/apache/tools/ant/launch/Locator.java | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/contributors.xml b/contributors.xml
index 815fdb427..75664265a 100644
--- a/contributors.xml
+++ b/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>
diff --git a/src/main/org/apache/tools/ant/launch/Locator.java b/src/main/org/apache/tools/ant/launch/Locator.java
index 24e38efd3..b909f2808 100644
--- a/src/main/org/apache/tools/ant/launch/Locator.java
+++ b/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());