svn commit: r1700890 - /tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java

[markt]

Author: markt
Date: Wed Sep  2 20:21:14 2015
New Revision: 1700890

URL: http://svn.apache.org/r1700890
Log:
Small simplification
Use 'conv == null' to indicate that conv has not been set rather than a 
separate flag.

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=1700890&r1=1700889&r2=1700890&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Wed Sep  
2 20:21:14 2015
@@ -117,12 +117,6 @@ public class OutputBuffer extends Writer
 
 
     /**
-     * Encoder is set.
-     */
-    private boolean gotEnc = false;
-
-
-    /**
      * List of encoders.
      */
     protected final ConcurrentHashMap<String, C2BConverter> encoders = new 
ConcurrentHashMap<>();
@@ -238,11 +232,11 @@ public class OutputBuffer extends Writer
         suspended = false;
         doFlush = false;
 
-        if (conv!= null) {
+        if (conv != null) {
             conv.recycle();
+            conv = null;
         }
 
-        gotEnc = false;
         enc = null;
     }
 
@@ -555,13 +549,10 @@ public class OutputBuffer extends Writer
     }
 
 
-    public void checkConverter()
-        throws IOException {
-
-        if (!gotEnc) {
+    public void checkConverter() throws IOException {
+        if (conv == null) {
             setConverter();
         }
-
     }
 
 
@@ -572,7 +563,6 @@ public class OutputBuffer extends Writer
             enc = coyoteResponse.getCharacterEncoding();
         }
 
-        gotEnc = true;
         if (enc == null) {
             enc = DEFAULT_ENCODING;
         }
@@ -641,7 +631,7 @@ public class OutputBuffer extends Writer
         bytesWritten = 0;
         charsWritten = 0;
         if (resetWriterStreamFlags) {
-            gotEnc = false;
+            conv = null;
             enc = null;
         }
         initial = true;



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