diff options
| author | Michael Osipov <michaelo@apache.org> | 2019-02-16 22:41:31 +0000 |
|---|---|---|
| committer | Michael Osipov <michaelo@apache.org> | 2019-02-16 22:41:31 +0000 |
| commit | 9c889cb2b54c002d7693097d7bc21684441e86bd (patch) | |
| tree | 3d670f81845deca6681ffe8bb9dadad613d70f90 /velocity-engine-core/src/main/java | |
| parent | 0ee78a14c767b84db6c8c6cb58385aef8d416d9c (diff) | |
| download | apache-velocity-engine-9c889cb2b54c002d7693097d7bc21684441e86bd.tar.gz | |
[VELOCITY-908] Initialization failure on Windows with Turkish locale
git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/trunk@1853730 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'velocity-engine-core/src/main/java')
| -rw-r--r-- | velocity-engine-core/src/main/java/org/apache/velocity/io/UnicodeInputStream.java | 5 | ||||
| -rw-r--r-- | velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/io/UnicodeInputStream.java b/velocity-engine-core/src/main/java/org/apache/velocity/io/UnicodeInputStream.java index ce9bbb06..c2a0d20a 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/io/UnicodeInputStream.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/io/UnicodeInputStream.java @@ -24,6 +24,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.PushbackInputStream; +import java.util.Locale; /** * This is an input stream that is unicode BOM aware. This allows you to e.g. read @@ -344,8 +345,8 @@ public class UnicodeInputStream */ public static boolean sameEncoding(String left, String right) { - left = left.toUpperCase().replace("-", "").replace("_",""); - right = right.toUpperCase().replace("-", "").replace("_",""); + left = left.toUpperCase(Locale.ROOT).replace("-", "").replace("_",""); + right = right.toUpperCase(Locale.ROOT).replace("-", "").replace("_",""); return left.equals(right); } diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java index 6b79a827..0a368ac4 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java @@ -64,6 +64,7 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Hashtable; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.NoSuchElementException; import java.util.Properties; @@ -351,7 +352,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices String im = getString(SPACE_GOBBLING, "lines"); try { - spaceGobbling = SpaceGobbling.valueOf(im.toUpperCase()); + spaceGobbling = SpaceGobbling.valueOf(im.toUpperCase(Locale.ROOT)); } catch (NoSuchElementException nse) { |