You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2015/02/12 15:10:52 UTC
svn commit: r1659263 - in /tomcat/trunk:
java/org/apache/naming/factory/BeanFactory.java
test/org/apache/coyote/ajp/SimpleAjpClient.java
test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
Author: kkolinko
Date: Thu Feb 12 14:10:52 2015
New Revision: 1659263
URL: http://svn.apache.org/r1659263
Log:
Use an explicit Locale when converting to upper case. - followup to r1659193
Modified:
tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java
tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
Modified: tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java?rev=1659263&r1=1659262&r2=1659263&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java Thu Feb 12 14:10:52 2015
@@ -25,6 +25,7 @@ import java.lang.reflect.Method;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Hashtable;
+import java.util.Locale;
import java.util.Map;
import javax.naming.Context;
@@ -170,7 +171,7 @@ public class BeanFactory
param = param.substring(0, index).trim();
} else {
setterName = "set" +
- param.substring(0, 1).toUpperCase() +
+ param.substring(0, 1).toUpperCase(Locale.ENGLISH) +
param.substring(1);
}
try {
Modified: tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java?rev=1659263&r1=1659262&r2=1659263&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java (original)
+++ tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java Thu Feb 12 14:10:52 2015
@@ -19,6 +19,7 @@ package org.apache.coyote.ajp;
import java.io.IOException;
import java.io.InputStream;
import java.net.Socket;
+import java.util.Locale;
import javax.net.SocketFactory;
@@ -64,7 +65,7 @@ public class SimpleAjpClient {
}
public void setMethod(String method) {
- method = method.toUpperCase();
+ method = method.toUpperCase(Locale.ENGLISH);
switch (method) {
case "OPTIONS":
this.method = 1;
Modified: tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java?rev=1659263&r1=1659262&r2=1659263&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java (original)
+++ tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java Thu Feb 12 14:10:52 2015
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import javax.servlet.ServletContext;
@@ -225,7 +226,7 @@ public class TestAbstractAjpProcessor ex
for (String name: headers.keySet()) {
value = headers.get(name);
- name = name.toUpperCase();
+ name = name.toUpperCase(Locale.ENGLISH);
switch (name) {
case "ACCEPT":
forwardMessage.addHeader(0xA001, value);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org