svn commit: r1752789 - /velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/io/UnicodeInputStream.java

[cbrisson]

Author: cbrisson
Date: Fri Jul 15 07:44:12 2016
New Revision: 1752789

URL: http://svn.apache.org/viewvc?rev=1752789&view=rev
Log:
fix: encoding name comparison function should also handle '_'

Modified:
    
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/io/UnicodeInputStream.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=1752789&r1=1752788&r2=1752789&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
 Fri Jul 15 07:44:12 2016
@@ -344,8 +344,8 @@ public class UnicodeInputStream
      */
     public static boolean sameEncoding(String left, String right)
     {
-        left = left.toUpperCase().replace("-", "");
-        right = right.toUpperCase().replace("-", "");
+        left = left.toUpperCase().replace("-", "").replace("_","");
+        right = right.toUpperCase().replace("-", "").replace("_","");
         return left.equals(right);
     }