Author: remy.maucherat(a)jboss.com
Date: 2011-06-28 10:39:45 -0400 (Tue, 28 Jun 2011)
New Revision: 1748
Modified:
branches/2.1.x/java/org/apache/catalina/connector/InputBuffer.java
branches/2.1.x/java/org/apache/catalina/connector/OutputBuffer.java
branches/3.0.x/java/org/apache/catalina/connector/InputBuffer.java
branches/3.0.x/java/org/apache/catalina/connector/OutputBuffer.java
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector/InputBuffer.java
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector/OutputBuffer.java
trunk/java/org/apache/catalina/connector/InputBuffer.java
trunk/java/org/apache/catalina/connector/OutputBuffer.java
Log:
- Improve use of the encoder and decoder maps.
Modified: branches/2.1.x/java/org/apache/catalina/connector/InputBuffer.java
===================================================================
--- branches/2.1.x/java/org/apache/catalina/connector/InputBuffer.java 2011-06-28 14:03:06
UTC (rev 1747)
+++ branches/2.1.x/java/org/apache/catalina/connector/InputBuffer.java 2011-06-28 14:39:45
UTC (rev 1748)
@@ -23,6 +23,7 @@
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.HashMap;
+import java.util.Locale;
import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.util.StringManager;
@@ -542,8 +543,7 @@
enc = coyoteRequest.getCharacterEncoding();
gotEnc = true;
- if (enc == null)
- enc = DEFAULT_ENCODING;
+ enc = (enc == null) ? DEFAULT_ENCODING : enc.toUpperCase(Locale.US);
conv = encoders.get(enc);
if (conv == null) {
if (SecurityUtil.isPackageProtectionEnabled()){
Modified: branches/2.1.x/java/org/apache/catalina/connector/OutputBuffer.java
===================================================================
--- branches/2.1.x/java/org/apache/catalina/connector/OutputBuffer.java 2011-06-28
14:03:06 UTC (rev 1747)
+++ branches/2.1.x/java/org/apache/catalina/connector/OutputBuffer.java 2011-06-28
14:39:45 UTC (rev 1748)
@@ -24,6 +24,7 @@
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.HashMap;
+import java.util.Locale;
import org.apache.coyote.ActionCode;
import org.apache.coyote.Response;
@@ -554,8 +555,7 @@
enc = coyoteResponse.getCharacterEncoding();
gotEnc = true;
- if (enc == null)
- enc = DEFAULT_ENCODING;
+ enc = (enc == null) ? DEFAULT_ENCODING : enc.toUpperCase(Locale.US);
conv = (C2BConverter) encoders.get(enc);
if (conv == null) {
Modified: branches/3.0.x/java/org/apache/catalina/connector/InputBuffer.java
===================================================================
--- branches/3.0.x/java/org/apache/catalina/connector/InputBuffer.java 2011-06-28 14:03:06
UTC (rev 1747)
+++ branches/3.0.x/java/org/apache/catalina/connector/InputBuffer.java 2011-06-28 14:39:45
UTC (rev 1748)
@@ -23,6 +23,7 @@
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.HashMap;
+import java.util.Locale;
import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.util.StringManager;
@@ -556,8 +557,7 @@
enc = coyoteRequest.getCharacterEncoding();
gotEnc = true;
- if (enc == null)
- enc = DEFAULT_ENCODING;
+ enc = (enc == null) ? DEFAULT_ENCODING : enc.toUpperCase(Locale.US);
conv = encoders.get(enc);
if (conv == null) {
if (SecurityUtil.isPackageProtectionEnabled()){
Modified: branches/3.0.x/java/org/apache/catalina/connector/OutputBuffer.java
===================================================================
--- branches/3.0.x/java/org/apache/catalina/connector/OutputBuffer.java 2011-06-28
14:03:06 UTC (rev 1747)
+++ branches/3.0.x/java/org/apache/catalina/connector/OutputBuffer.java 2011-06-28
14:39:45 UTC (rev 1748)
@@ -24,6 +24,7 @@
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.HashMap;
+import java.util.Locale;
import org.apache.coyote.ActionCode;
import org.apache.coyote.Response;
@@ -554,8 +555,7 @@
enc = coyoteResponse.getCharacterEncoding();
gotEnc = true;
- if (enc == null)
- enc = DEFAULT_ENCODING;
+ enc = (enc == null) ? DEFAULT_ENCODING : enc.toUpperCase(Locale.US);
conv = (C2BConverter) encoders.get(enc);
if (conv == null) {
Modified:
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector/InputBuffer.java
===================================================================
---
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector/InputBuffer.java 2011-06-28
14:03:06 UTC (rev 1747)
+++
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector/InputBuffer.java 2011-06-28
14:39:45 UTC (rev 1748)
@@ -23,6 +23,7 @@
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.HashMap;
+import java.util.Locale;
import org.apache.catalina.security.SecurityUtil;
import org.apache.coyote.Request;
@@ -475,8 +476,7 @@
enc = coyoteRequest.getCharacterEncoding();
gotEnc = true;
- if (enc == null)
- enc = DEFAULT_ENCODING;
+ enc = (enc == null) ? DEFAULT_ENCODING : enc.toUpperCase(Locale.US);
conv = (B2CConverter) encoders.get(enc);
if (conv == null) {
if (SecurityUtil.isPackageProtectionEnabled()){
Modified:
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector/OutputBuffer.java
===================================================================
---
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector/OutputBuffer.java 2011-06-28
14:03:06 UTC (rev 1747)
+++
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/connector/OutputBuffer.java 2011-06-28
14:39:45 UTC (rev 1748)
@@ -24,6 +24,7 @@
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.HashMap;
+import java.util.Locale;
import org.apache.coyote.ActionCode;
import org.apache.coyote.Response;
@@ -497,8 +498,7 @@
enc = coyoteResponse.getCharacterEncoding();
gotEnc = true;
- if (enc == null)
- enc = DEFAULT_ENCODING;
+ enc = (enc == null) ? DEFAULT_ENCODING : enc.toUpperCase(Locale.US);
conv = (C2BConverter) encoders.get(enc);
if (conv == null) {
Modified: trunk/java/org/apache/catalina/connector/InputBuffer.java
===================================================================
--- trunk/java/org/apache/catalina/connector/InputBuffer.java 2011-06-28 14:03:06 UTC (rev
1747)
+++ trunk/java/org/apache/catalina/connector/InputBuffer.java 2011-06-28 14:39:45 UTC (rev
1748)
@@ -557,11 +557,7 @@
enc = coyoteRequest.getCharacterEncoding();
gotEnc = true;
- if (enc == null) {
- enc = DEFAULT_ENCODING;
- } else {
- enc = enc.toUpperCase(Locale.US);
- }
+ enc = (enc == null) ? DEFAULT_ENCODING : enc.toUpperCase(Locale.US);
conv = encoders.get(enc);
if (conv == null) {
if (SecurityUtil.isPackageProtectionEnabled()) {
Modified: trunk/java/org/apache/catalina/connector/OutputBuffer.java
===================================================================
--- trunk/java/org/apache/catalina/connector/OutputBuffer.java 2011-06-28 14:03:06 UTC
(rev 1747)
+++ trunk/java/org/apache/catalina/connector/OutputBuffer.java 2011-06-28 14:39:45 UTC
(rev 1748)
@@ -556,11 +556,7 @@
enc = coyoteResponse.getCharacterEncoding();
gotEnc = true;
- if (enc == null) {
- enc = DEFAULT_ENCODING;
- } else {
- enc = enc.toUpperCase(Locale.US);
- }
+ enc = (enc == null) ? DEFAULT_ENCODING : enc.toUpperCase(Locale.US);
conv = encoders.get(enc);
if (conv == null) {
if (Globals.IS_SECURITY_ENABLED){
Show replies by date