[myfaces] branch master updated: use FastWriter

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/master by this push:
     new 90624d7  use FastWriter
90624d7 is described below

commit 90624d77a88c994a426dc3490a8a355d5c8637b1
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Sun Jul 12 23:35:22 2020 +0200

    use FastWriter
---
 .../apache/myfaces/push/HtmlBufferResponseWriterWrapper.java | 12 +++++++-----
 .../org/apache/myfaces/renderkit/html/util/HTMLEncoder.java  |  2 +-
 .../main/java/org/apache/myfaces/util/lang/FastWriter.java   |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/impl/src/main/java/org/apache/myfaces/push/HtmlBufferResponseWriterWrapper.java b/impl/src/main/java/org/apache/myfaces/push/HtmlBufferResponseWriterWrapper.java
index 065c002..fba0ade 100644
--- a/impl/src/main/java/org/apache/myfaces/push/HtmlBufferResponseWriterWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/push/HtmlBufferResponseWriterWrapper.java
@@ -22,6 +22,7 @@ package org.apache.myfaces.push;
 import javax.faces.context.ResponseWriter;
 import java.io.*;
 import org.apache.myfaces.renderkit.html.HtmlResponseWriterImpl;
+import org.apache.myfaces.util.lang.FastWriter;
 
 /**
  * A buffer for content which should not directly be rendered to the page.
@@ -35,14 +36,15 @@ public class HtmlBufferResponseWriterWrapper extends HtmlResponseWriterImpl
     /**
      * Buffer writer to write content to and buffer it.
      *
-     * Moved from OutputStream to Writer to account for issue
-     * TOMAHAWK-648.
+     * Moved from OutputStream to Writer to account for issue TOMAHAWK-648.
      */
-    private StringWriter bufferWriter;
+    private FastWriter bufferWriter;
+
     /**
      * Writer to wrap buffer-writer.
      */
     private PrintWriter wrapperWriter;
+
     /**
      * Original response writer.
      */
@@ -66,7 +68,7 @@ public class HtmlBufferResponseWriterWrapper extends HtmlResponseWriterImpl
      */
     static public HtmlBufferResponseWriterWrapper getInstance(ResponseWriter initialWriter)
     {
-        StringWriter bufferWriter = new StringWriter();
+        FastWriter bufferWriter = new FastWriter();
         PrintWriter wrapperWriter = new PrintWriter(bufferWriter, true);
 
         return new HtmlBufferResponseWriterWrapper(initialWriter, bufferWriter, wrapperWriter);
@@ -80,7 +82,7 @@ public class HtmlBufferResponseWriterWrapper extends HtmlResponseWriterImpl
      * @param bufferWriter A buffer to store content to.
      * @param wrapperWriter A wrapper around the buffer.
      */
-    private HtmlBufferResponseWriterWrapper(ResponseWriter initialWriter, StringWriter bufferWriter,
+    private HtmlBufferResponseWriterWrapper(ResponseWriter initialWriter, FastWriter bufferWriter,
             PrintWriter wrapperWriter)
     {
         super(wrapperWriter, (initialWriter == null) ? null : initialWriter.getContentType(),
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/HTMLEncoder.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/HTMLEncoder.java
index 36e49be..95eb273 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/HTMLEncoder.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/HTMLEncoder.java
@@ -1106,7 +1106,7 @@ public abstract class HTMLEncoder
 
         try
         {
-            try (OutputStreamWriter writer = new OutputStreamWriter(baos,characterEncoding))
+            try (OutputStreamWriter writer = new OutputStreamWriter(baos, characterEncoding))
             {
                 writer.write(c);
                 writer.flush();
diff --git a/impl/src/main/java/org/apache/myfaces/util/lang/FastWriter.java b/impl/src/main/java/org/apache/myfaces/util/lang/FastWriter.java
index c2afdc2..face8c2 100644
--- a/impl/src/main/java/org/apache/myfaces/util/lang/FastWriter.java
+++ b/impl/src/main/java/org/apache/myfaces/util/lang/FastWriter.java
@@ -30,7 +30,7 @@ import java.io.Writer;
  */
 public final class FastWriter extends Writer
 {
-   private char[] buff;
+    private char[] buff;
     private int size;
 
     public FastWriter()