bodewig 2004/04/21 00:19:13
Modified: . Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/launch Tag: ANT_16_BRANCH
Locator.java
Log:
merge
Revision Changes Path
No revision
No revision
1.503.2.78 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.77
retrieving revision 1.503.2.78
diff -u -r1.503.2.77 -r1.503.2.78
--- WHATSNEW 20 Apr 2004 22:32:28 -0000 1.503.2.77
+++ WHATSNEW 21 Apr 2004 07:19:13 -0000 1.503.2.78
@@ -58,6 +58,9 @@
* replacestring tokenfilter only replaced the first occurrence.
+* Ant failed to locate tools.jar if the jre directory name wasn't all
+ lowercase. Bugzilla Report 25798.
+
Other changes:
--------------
No revision
No revision
1.6.2.6 +2 -1 ant/src/main/org/apache/tools/ant/launch/Locator.java
Index: Locator.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/launch/Locator.java,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -u -r1.6.2.5 -r1.6.2.6
--- Locator.java 9 Mar 2004 17:01:32 -0000 1.6.2.5
+++ Locator.java 21 Apr 2004 07:19:13 -0000 1.6.2.6
@@ -23,6 +23,7 @@
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
@@ -172,7 +173,7 @@
// 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");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
