Author: markt
Date: Thu May 4 14:42:17 2017
New Revision: 1793816
URL: http://svn.apache.org/viewvc?rev=1793816&view=rev
Log:
Refactor - simplify
Modified:
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
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=1793816&r1=1793815&r2=1793816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Thu May
4 14:42:17 2017
@@ -103,12 +103,6 @@ public class OutputBuffer extends Writer
/**
- * Encoding to use.
- */
- private String enc;
-
-
- /**
* Current char to byte converter.
*/
protected C2BConverter conv;
@@ -204,8 +198,6 @@ public class OutputBuffer extends Writer
conv.recycle();
conv = null;
}
-
- enc = null;
}
@@ -530,13 +522,11 @@ public class OutputBuffer extends Writer
public void checkConverter() throws IOException {
- if (conv == null) {
- setConverter();
+ if (conv != null) {
+ return;
}
- }
-
- private void setConverter() throws IOException {
+ String enc = null;
if (coyoteResponse != null) {
enc = coyoteResponse.getCharacterEncoding();
@@ -631,7 +621,6 @@ public class OutputBuffer extends Writer
conv.recycle();
}
conv = null;
- enc = null;
}
initial = true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
