Author: markt
Date: Sun Mar 17 14:11:35 2013
New Revision: 1457453
URL: http://svn.apache.org/r1457453
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54712
Code clean-up. Use Locale.ENGLISH consistently for upper/lower case conversions.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/MediaType.java
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1457452
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java?rev=1457453&r1=1457452&r2=1457453&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Sun
Mar 17 14:11:35 2013
@@ -50,10 +50,10 @@ public class B2CConverter {
static {
for (Charset charset: Charset.availableCharsets().values()) {
encodingToCharsetCache.put(
- charset.name().toLowerCase(Locale.US), charset);
+ charset.name().toLowerCase(Locale.ENGLISH), charset);
for (String alias : charset.aliases()) {
encodingToCharsetCache.put(
- alias.toLowerCase(Locale.US), charset);
+ alias.toLowerCase(Locale.ENGLISH), charset);
}
}
Charset iso88591 = null;
@@ -73,7 +73,7 @@ public class B2CConverter {
throws UnsupportedEncodingException {
// Encoding names should all be ASCII
- String lowerCaseEnc = enc.toLowerCase(Locale.US);
+ String lowerCaseEnc = enc.toLowerCase(Locale.ENGLISH);
return getCharsetLower(lowerCaseEnc);
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java?rev=1457453&r1=1457452&r2=1457453&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
Sun Mar 17 14:11:35 2013
@@ -132,7 +132,7 @@ public class HttpParser {
return null;
}
String value = null;
- Integer type = fieldTypes.get(field.toLowerCase(Locale.US));
+ Integer type = fieldTypes.get(field.toLowerCase(Locale.ENGLISH));
if (type == null) {
// auth-param = token "=" ( token | quoted-string )
type = FIELD_TYPE_TOKEN_OR_QUOTED_STRING;
@@ -212,9 +212,9 @@ public class HttpParser {
if (skipConstant(input, "=") == SkipConstantResult.FOUND) {
String value = readTokenOrQuotedString(input, true);
- parameters.put(attribute.toLowerCase(Locale.US), value);
+ parameters.put(attribute.toLowerCase(Locale.ENGLISH), value);
} else {
- parameters.put(attribute.toLowerCase(Locale.US), "");
+ parameters.put(attribute.toLowerCase(Locale.ENGLISH), "");
}
lookForSemiColon = skipConstant(input, ";");
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/MediaType.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/MediaType.java?rev=1457453&r1=1457452&r2=1457453&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/MediaType.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/MediaType.java
Sun Mar 17 14:11:35 2013
@@ -60,7 +60,7 @@ public class MediaType {
}
public String getParameterValue(String parameter) {
- return parameters.get(parameter.toLowerCase(Locale.US));
+ return parameters.get(parameter.toLowerCase(Locale.ENGLISH));
}
@Override
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=1457453&r1=1457452&r2=1457453&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Sun Mar 17 14:11:35 2013
@@ -806,7 +806,7 @@ public class PoolProperties implements P
final String[] prefix = new String[] {"get","is"};
for (int j=0; j<prefix.length; j++) {
- String name = prefix[j] + fields[i].substring(0,
1).toUpperCase(Locale.US) +
+ String name = prefix[j] + fields[i].substring(0,
1).toUpperCase(Locale.ENGLISH) +
fields[i].substring(1);
Method m = null;
try {
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java?rev=1457453&r1=1457452&r2=1457453&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java
Sun Mar 17 14:11:35 2013
@@ -60,7 +60,7 @@ public abstract class SimpleHttpClient {
protected static final String SESSION_COOKIE_NAME = "JSESSIONID";
protected static final String SESSION_PARAMETER_NAME =
- SESSION_COOKIE_NAME.toLowerCase(Locale.US);
+ SESSION_COOKIE_NAME.toLowerCase(Locale.ENGLISH);
private static final String COOKIE_HEADER_PREFIX = "Set-Cookie: ";
private static final String SESSION_COOKIE_HEADER_PREFIX =
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
