Merge pull request #2326 from Fudeveloper/add-missing-locale

hazendaz · web-flow · commit 5fca451c3bce · 2021-08-26T08:52:51.000-04:00
Add missing Locale.ENGLISH
diff --git a/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java b/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
@@ -988,7 +988,7 @@ private boolean anyNotNullColumnHasValue(ResultMapping resultMapping, String col
       return false;
     } else if (columnPrefix != null) {
       for (String columnName : rsw.getColumnNames()) {
-        if (columnName.toUpperCase().startsWith(columnPrefix.toUpperCase())) {
+        if (columnName.toUpperCase(Locale.ENGLISH).startsWith(columnPrefix.toUpperCase(Locale.ENGLISH))) {
           return true;
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -988,7 +988,7 @@ private boolean anyNotNullColumnHasValue(ResultMapping resultMapping, String col`
`988`	`988`	`return false;`
`989`	`989`	`} else if (columnPrefix != null) {`
`990`	`990`	`for (String columnName : rsw.getColumnNames()) {`
`991`		`- if (columnName.toUpperCase().startsWith(columnPrefix.toUpperCase())) {`
	`991`	`+ if (columnName.toUpperCase(Locale.ENGLISH).startsWith(columnPrefix.toUpperCase(Locale.ENGLISH))) {`
`992`	`992`	`return true;`
`993`	`993`	`}`
`994`	`994`	`}`