Author: markt
Date: Thu Sep 3 13:45:39 2015
New Revision: 1701023
URL: http://svn.apache.org/r1701023
Log:
Refactor. Remove duplicate constants
Modified:
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1701023&r1=1701022&r2=1701023&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Thu Sep 3
13:45:39 2015
@@ -54,9 +54,6 @@ public class InputBuffer extends Reader
// -------------------------------------------------------------- Constants
-
- public static final String DEFAULT_ENCODING =
- org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING;
public static final int DEFAULT_BUFFER_SIZE = 8*1024;
// The buffer can be used for byte[] and char[] reading
@@ -65,8 +62,8 @@ public class InputBuffer extends Reader
public final int CHAR_STATE = 1;
public final int BYTE_STATE = 2;
- // ----------------------------------------------------- Instance Variables
+ // ----------------------------------------------------- Instance Variables
/**
* The byte buffer.
@@ -564,7 +561,7 @@ public class InputBuffer extends Reader
gotEnc = true;
if (enc == null) {
- enc = DEFAULT_ENCODING;
+ enc = org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING;
}
conv = encoders.get(enc);
if (conv == null) {
Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1701023&r1=1701022&r2=1701023&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Thu Sep
3 13:45:39 2015
@@ -51,8 +51,6 @@ public class OutputBuffer extends Writer
// -------------------------------------------------------------- Constants
- public static final String DEFAULT_ENCODING =
- org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING;
public static final int DEFAULT_BUFFER_SIZE = 8*1024;
@@ -565,7 +563,7 @@ public class OutputBuffer extends Writer
}
if (enc == null) {
- enc = DEFAULT_ENCODING;
+ enc = org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING;
}
final Charset charset = B2CConverter.getCharset(enc);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
