Author: markt
Date: Thu May 4 19:08:39 2017
New Revision: 1793856
URL: http://svn.apache.org/viewvc?rev=1793856&view=rev
Log:
Refactor - simplify
(variation of r1793816)
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1793856&r1=1793855&r2=1793856&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
Thu May 4 19:08:39 2017
@@ -562,13 +562,10 @@ public class InputBuffer extends Reader
public void checkConverter() throws IOException {
- if (conv == null) {
- setConverter();
+ if (conv != null) {
+ return;
}
- }
-
- private void setConverter() throws IOException {
if (coyoteRequest != null) {
enc = coyoteRequest.getCharacterEncoding();
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1793856&r1=1793855&r2=1793856&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
Thu May 4 19:08:39 2017
@@ -555,13 +555,9 @@ public class OutputBuffer extends Writer
public void checkConverter() throws IOException {
- if (conv == null) {
- setConverter();
+ if (conv != null) {
+ return;
}
- }
-
-
- private void setConverter() throws IOException {
if (coyoteResponse != null) {
enc = coyoteResponse.getCharacterEncoding();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
