svn commit: r894611 - /sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/Util.java

[fmeschbe]

Author: fmeschbe
Date: Wed Dec 30 13:43:45 2009
New Revision: 894611

URL: http://svn.apache.org/viewvc?rev=894611&view=rev
Log:
SLING-1256 Compare encodings ignoring case since character set (encoding) names 
are case-insensitive strings.

Modified:
    
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/Util.java

Modified: 
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/Util.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/Util.java?rev=894611&r1=894610&r2=894611&view=diff
==============================================================================
--- 
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/Util.java
 (original)
+++ 
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/Util.java
 Wed Dec 30 13:43:45 2009
@@ -107,7 +107,7 @@
                     AbstractRequestParameter param = 
(AbstractRequestParameter) params[i];
 
                     // fix encoding if different
-                    if (!formEncoding.equals(param.getEncoding())) {
+                    if (!formEncoding.equalsIgnoreCase(param.getEncoding())) {
                         param.setEncoding(formEncoding);
 
                         // prepare the parameter for renaming
@@ -133,7 +133,7 @@
 
     private static String reencode(String parName, String encoding) {
         // re-encode the parameter to the encoding
-        if (!ENCODING_DIRECT.equals(encoding)) {
+        if (!ENCODING_DIRECT.equalsIgnoreCase(encoding)) {
             try {
                 return new String(parName.getBytes(ENCODING_DIRECT), encoding);
             } catch (UnsupportedEncodingException uee) {