From 88039803e60955929a3deb338392a13d661f5147 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Wed, 21 Apr 2004 07:18:48 +0000
Subject: [PATCH] don't depend on jre being lowercase, PR: 25798

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276376 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                          | 3 +++
 src/main/org/apache/tools/ant/launch/Locator.java | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/WHATSNEW b/WHATSNEW
index ea12891b6..1ab56313b 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -122,6 +122,9 @@ Fixed bugs:
 * AntClassLoader#getResource could return invalid URLs.  Bugzilla
   Report 28060.
 
+* Ant failed to locate tools.jar if the jre directory name wasn't all
+  lowercase.  Bugzilla Report 25798.
+
 Other changes:
 --------------
 
diff --git a/src/main/org/apache/tools/ant/launch/Locator.java b/src/main/org/apache/tools/ant/launch/Locator.java
index ec790e38e..b8f73c5c9 100644
--- a/src/main/org/apache/tools/ant/launch/Locator.java
+++ b/src/main/org/apache/tools/ant/launch/Locator.java
@@ -23,6 +23,7 @@ import java.io.File;
 import java.io.FilenameFilter;
 import java.text.CharacterIterator;
 import java.text.StringCharacterIterator;
+import java.util.Locale;
 
 /**
  * The Locator is a utility class which is used to find certain items
@@ -181,7 +182,7 @@ public final class Locator {
         // couldn't find compiler - try to find tools.jar
         // based on java.home setting
         String javaHome = System.getProperty("java.home");
-        if (javaHome.endsWith("jre")) {
+        if (javaHome.toLowerCase(Locale.US).endsWith("jre")) {
             javaHome = javaHome.substring(0, javaHome.length() - 4);
         }
         File toolsJar = new File(javaHome + "/lib/tools.jar");