svn commit: r1562006 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak: plugins/nodetype/write/PropertyDefinitionTemplateImpl.java query/xpath/Expression.java

[thomasm]

Author: thomasm
Date: Tue Jan 28 08:45:08 2014
New Revision: 1562006

URL: http://svn.apache.org/r1562006
Log:
OAK-260 Avoid the "Turkish Locale Problem"

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/PropertyDefinitionTemplateImpl.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/Expression.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/PropertyDefinitionTemplateImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/PropertyDefinitionTemplateImpl.java?rev=1562006&r1=1562005&r2=1562006&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/PropertyDefinitionTemplateImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/PropertyDefinitionTemplateImpl.java
 Tue Jan 28 08:45:08 2014
@@ -27,6 +27,7 @@ import static org.apache.jackrabbit.oak.
 import static 
org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.RESIDUAL_NAME;
 
 import java.util.Arrays;
+import java.util.Locale;
 
 import javax.jcr.PropertyType;
 import javax.jcr.RepositoryException;
@@ -99,7 +100,7 @@ class PropertyDefinitionTemplateImpl ext
 
         tree.setProperty(
                 JCR_REQUIREDTYPE,
-                PropertyType.nameFromValue(requiredType).toUpperCase());
+                
PropertyType.nameFromValue(requiredType).toUpperCase(Locale.ENGLISH));
         tree.setProperty(JCR_MULTIPLE, isMultiple);
         tree.setProperty(JCR_IS_FULLTEXT_SEARCHABLE, fullTextSearchable);
         tree.setProperty(JCR_IS_QUERY_ORDERABLE, queryOrderable);

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/Expression.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/Expression.java?rev=1562006&r1=1562005&r2=1562006&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/Expression.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/Expression.java
 Tue Jan 28 08:45:08 2014
@@ -191,7 +191,7 @@ abstract class Expression {
                     String decoded = ISO9075.decode(raw);
                     String encoded = ISO9075.encode(decoded);
                     rightExpr = SQL2Parser.escapeStringLiteral(decoded);
-                    if (!encoded.toUpperCase().equals(raw.toUpperCase())) {
+                    if (!encoded.equalsIgnoreCase(raw)) {
                         // nothing can potentially match
                         impossible = true;
                     }