From 0339ff4550a4975e6f293ce7fde77eeffbf9acb2 Mon Sep 17 00:00:00 2001 From: Lucas Cabral Date: Tue, 17 Nov 2020 19:04:53 -0300 Subject: [PATCH] Fix meaningless close --- .../main/java/org/apache/struts2/jasper/compiler/JspReader.java | 2 -- .../main/java/org/apache/struts2/jasper/compiler/Parser.java | 1 - 2 files changed, 3 deletions(-) diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspReader.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspReader.java index 1abd9f920..808687e3e 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspReader.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspReader.java @@ -209,7 +209,6 @@ class JspReader { CharArrayWriter caw = new CharArrayWriter(); while (!stop.equals(mark())) caw.write(nextChar()); - caw.close(); reset(oldstart); return caw.toString(); } @@ -595,7 +594,6 @@ class JspReader { char buf[] = new char[1024]; for (int i = 0 ; (i = reader.read(buf)) != -1 ;) caw.write(buf, 0, i); - caw.close(); if (current == null) { current = new Mark(this, caw.toCharArray(), fileid, getFile(fileid), master, encoding); diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Parser.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Parser.java index 24a8c1615..a8cef55b0 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Parser.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Parser.java @@ -324,7 +324,6 @@ class Parser implements TagConstants { ++i; } } - cw.close(); return cw.toString(); }