svn commit: r1793811 - /tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java

[markt]

Author: markt
Date: Thu May  4 14:28:57 2017
New Revision: 1793811

URL: http://svn.apache.org/viewvc?rev=1793811&view=rev
Log:
Refactor - simplify

Modified:
    tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.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=1793811&r1=1793810&r2=1793811&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Thu May  4 
14:28:57 2017
@@ -101,12 +101,6 @@ public class InputBuffer extends Reader
 
 
     /**
-     * Encoding to use.
-     */
-    private String enc;
-
-
-    /**
      * Current byte to char converter.
      */
     protected B2CConverter conv;
@@ -205,8 +199,6 @@ public class InputBuffer extends Reader
             encoders.get(conv.getCharset()).push(conv);
             conv = null;
         }
-
-        enc = null;
     }
 
 
@@ -550,13 +542,11 @@ public class InputBuffer extends Reader
 
 
     public void checkConverter() throws IOException {
-        if (conv == null) {
-            setConverter();
+        if (conv != null) {
+            return;
         }
-    }
-
 
-    private void setConverter() throws IOException {
+        String enc = null;
         if (coyoteRequest != null) {
             enc = coyoteRequest.getCharacterEncoding();
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org