[felix-dev] branch http-4.x updated: FELIX-6646 : Plugin registered using AbstractServlet renders a blank page.

[cziegeler]

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

cziegeler pushed a commit to branch http-4.x
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/http-4.x by this push:
     new 9bd54309cf FELIX-6646 : Plugin registered using AbstractServlet 
renders a blank page.
9bd54309cf is described below

commit 9bd54309cf2e047d55af30c532b8f2ba9d2162a3
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Sat Sep 2 10:57:30 2023 +0200

    FELIX-6646 : Plugin registered using AbstractServlet renders a blank page.
---
 .../felix/webconsole/internal/servlet/JakartaServletAdapter.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/JakartaServletAdapter.java
 
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/JakartaServletAdapter.java
index c25883f0de..56a07b9374 100644
--- 
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/JakartaServletAdapter.java
+++ 
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/JakartaServletAdapter.java
@@ -151,6 +151,7 @@ public class JakartaServletAdapter extends 
AbstractWebConsolePlugin {
     private static final class CheckHttpServletResponse extends 
HttpServletResponseWrapper {
 
         private boolean done = false;
+
         public CheckHttpServletResponse(HttpServletResponse response) {
             super(response);
         }
@@ -214,14 +215,13 @@ public class JakartaServletAdapter extends 
AbstractWebConsolePlugin {
     public void service( HttpServletRequest req, HttpServletResponse resp )
     throws ServletException, IOException {
         final CheckHttpServletResponse checkResponse = new 
CheckHttpServletResponse(resp);
-        // call plugin first
+        // call plugin service method first
         try {
-            plugin.service( 
(jakarta.servlet.http.HttpServletRequest)HttpServletRequestWrapper.getWrapper(req),
 
-                
(jakarta.servlet.http.HttpServletResponse)HttpServletResponseWrapper.getWrapper(resp)
 );
+            plugin.service( 
(jakarta.servlet.http.HttpServletRequest)HttpServletRequestWrapper.getWrapper(req),
 checkResponse);
         } catch (final jakarta.servlet.ServletException s) {
             throw ServletExceptionUtil.getServletException(s);
         }
-        // if a plugin did not create a response yet, call doGet to get a 
response
+        // if plugin did not create a response yet, call doGet to get a 
response
         if ( !checkResponse.isDone()) {
             this.doGet( req, resp );
         }