From b6cca669145aa0c2eddd78b8d300125a934439c4 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 1 Nov 2012 19:12:36 -0700 Subject: [PATCH 1/2] Fixing compile issue. File.getName(Locale) is not allowed. --- jetty-start/src/main/java/org/eclipse/jetty/start/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java index dabd5385f6f..7530f013420 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java @@ -386,7 +386,7 @@ public class Main return false; } - String name = path.getName(Locale.ENGLISH).toLowerCase(); + String name = path.getName().toLowerCase(); return (name.startsWith("jetty") && name.endsWith(".xml")); } }); From 13f6940fc3d19ef11ac2b5307fb5282f0d0d901e Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Fri, 2 Nov 2012 13:13:21 +1100 Subject: [PATCH 2/2] 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls --- jetty-start/src/main/java/org/eclipse/jetty/start/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java index 7530f013420..3aa0483d23d 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java @@ -386,7 +386,7 @@ public class Main return false; } - String name = path.getName().toLowerCase(); + String name = path.getName().toLowerCase(Locale.ENGLISH); return (name.startsWith("jetty") && name.endsWith(".xml")); } });