Author: michaelo Date: Sat Feb 16 22:41:31 2019 New Revision: 1853730 URL: http://svn.apache.org/viewvc?rev=1853730&view=rev Log: [VELOCITY-908] Initialization failure on Windows with Turkish locale
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/io/UnicodeInputStream.java velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/io/UnicodeInputStream.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/io/UnicodeInputStream.java?rev=1853730&r1=1853729&r2=1853730&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/io/UnicodeInputStream.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/io/UnicodeInputStream.java Sat Feb 16 22:41:31 2019 @@ -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); } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java?rev=1853730&r1=1853729&r2=1853730&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java Sat Feb 16 22:41:31 2019 @@ -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 String im = getString(SPACE_GOBBLING, "lines"); try { - spaceGobbling = SpaceGobbling.valueOf(im.toUpperCase()); + spaceGobbling = SpaceGobbling.valueOf(im.toUpperCase(Locale.ROOT)); } catch (NoSuchElementException nse) { Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java?rev=1853730&r1=1853729&r2=1853730&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java Sat Feb 16 22:41:31 2019 @@ -25,6 +25,8 @@ import org.apache.velocity.app.event.Ref import org.apache.velocity.context.Context; import org.apache.velocity.util.introspection.Info; +import java.util.Locale; + /** * This is a test set of event handlers, used to test event handler sequences. * @@ -42,7 +44,7 @@ public class Handler2 if (value == null) return null; else - return value.toString().toUpperCase(); + return value.toString().toUpperCase(Locale.ROOT); } /** Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java?rev=1853730&r1=1853729&r2=1853730&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java Sat Feb 16 22:41:31 2019 @@ -23,6 +23,7 @@ import org.apache.velocity.VelocityConte import org.apache.velocity.context.Context; import java.util.HashMap; +import java.util.Locale; import java.util.Map; /** @@ -73,7 +74,7 @@ public class TestContext implements Cont } else { - return key.toUpperCase(); + return key.toUpperCase(Locale.ROOT); } } }