This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 1ee6fd6c346b45d7bd5472cf4e5b7bde738a32ca Author: Juan Pablo Santos RodrÃguez <juanpablo.san...@gmail.com> AuthorDate: Sat Dec 2 20:51:53 2023 +0100 use engine.getEncoding instead of response.getEncoding the latter commits the response, causing errors later on the filter chain, f.ex. when trying to create a session b/c of the response has being previously committed - fixes error related to #322 --- jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java index fa8590d92..6535faa85 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java @@ -45,7 +45,6 @@ import java.io.IOException; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.UnsupportedEncodingException; -import java.nio.charset.Charset; /** @@ -95,8 +94,8 @@ public class WikiJSPFilter extends WikiServletFilter { final HttpServletResponseWrapper responseWrapper = new JSPWikiServletResponseWrapper( ( HttpServletResponse )response, m_wiki_encoding, useEncoding ); // fire PAGE_REQUESTED event - final String pagename = URLConstructor.parsePageFromURL( ( HttpServletRequest )request, Charset.forName( response.getCharacterEncoding() ) ); - fireEvent( WikiPageEvent.PAGE_REQUESTED, pagename ); + final String pagename = URLConstructor.parsePageFromURL( ( HttpServletRequest )request, m_engine.getContentEncoding() ); + fireEvent( WikiPageEvent.PAGE_REQUESTED, pagename != null ? pagename : m_engine.getFrontPage() ); super.doFilter( request, responseWrapper, chain ); // The response is now complete. Let's replace the markers now.