From 9f2e0b99e1d2911c1067a8a4bc49460795fc56e9 Mon Sep 17 00:00:00 2001 From: patlego Date: Fri, 31 Jul 2026 15:51:47 -0400 Subject: [PATCH 1/2] FELIX-6853 adding ability to inspect preprocessors when in debug mode --- .../base/internal/handler/PreprocessorHandler.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/handler/PreprocessorHandler.java b/http/base/src/main/java/org/apache/felix/http/base/internal/handler/PreprocessorHandler.java index ae30fdadaf..3d694998b9 100644 --- a/http/base/src/main/java/org/apache/felix/http/base/internal/handler/PreprocessorHandler.java +++ b/http/base/src/main/java/org/apache/felix/http/base/internal/handler/PreprocessorHandler.java @@ -20,6 +20,7 @@ import org.apache.felix.http.base.internal.logger.SystemLogger; import org.apache.felix.http.base.internal.runtime.PreprocessorInfo; +import org.apache.felix.http.base.internal.wrappers.PreprocessorWrapper; import org.jetbrains.annotations.NotNull; import org.osgi.framework.BundleContext; import org.osgi.service.servlet.runtime.dto.DTOConstants; @@ -30,6 +31,7 @@ import jakarta.servlet.ServletException; import jakarta.servlet.ServletRequest; import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; /** * The preprocessor handler handles the initialization and destruction of preprocessor @@ -129,7 +131,17 @@ public void handle(@NotNull final ServletRequest req, final Preprocessor local = this.preprocessor; if ( local != null ) { - local.doFilter(req, res, chain); + if (SystemLogger.LOGGER.isDebugEnabled()) { + HttpServletRequest hRequest = (HttpServletRequest) req; + if (local instanceof org.apache.felix.http.base.internal.wrappers.PreprocessorWrapper) { + PreprocessorWrapper tmpLocal = (org.apache.felix.http.base.internal.wrappers.PreprocessorWrapper) local; + SystemLogger.LOGGER.debug("Invoking OSGi preprocessor {} for path {}", tmpLocal.getPreprocessor().getClass().getName(), hRequest.getRequestURI()); + } else { + SystemLogger.LOGGER.debug("Invoking OSGi preprocessor {} for path {}", local.getClass().getName(), hRequest.getRequestURI()); + } + + } + local.doFilter(req, res, chain); } else { From c4fe993014326ba98e2a0bd5444708bbffe65846 Mon Sep 17 00:00:00 2001 From: patlego Date: Fri, 31 Jul 2026 16:04:06 -0400 Subject: [PATCH 2/2] FELIX-6853 fixing whitespace --- .../felix/http/base/internal/handler/PreprocessorHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/handler/PreprocessorHandler.java b/http/base/src/main/java/org/apache/felix/http/base/internal/handler/PreprocessorHandler.java index 3d694998b9..332930f411 100644 --- a/http/base/src/main/java/org/apache/felix/http/base/internal/handler/PreprocessorHandler.java +++ b/http/base/src/main/java/org/apache/felix/http/base/internal/handler/PreprocessorHandler.java @@ -141,7 +141,7 @@ public void handle(@NotNull final ServletRequest req, } } - local.doFilter(req, res, chain); + local.doFilter(req, res, chain); } else {