From b7c9c88f9f786f9a84b0c1dc34026194010755e2 Mon Sep 17 00:00:00 2001 From: Matt Gilman Date: Thu, 21 Dec 2017 14:54:09 -0500 Subject: [PATCH] NIFI-4444: - Ensure the /nifi-api/controller redirection filter executes before matching. This closes # 2358. Signed-off-by: Andy LoPresto --- .../org/apache/nifi/web/api/filter/RedirectResourceFilter.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/filter/RedirectResourceFilter.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/filter/RedirectResourceFilter.java index c17df15c21..f648d72293 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/filter/RedirectResourceFilter.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/filter/RedirectResourceFilter.java @@ -21,6 +21,7 @@ import org.apache.nifi.web.api.SiteToSiteResource; import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerRequestFilter; +import javax.ws.rs.container.PreMatching; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; import java.io.IOException; @@ -29,6 +30,7 @@ import java.net.URI; /** * This filter provides backward compatibility for Resource URI changes. */ +@PreMatching public class RedirectResourceFilter implements ContainerRequestFilter { /**