You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2018/01/02 15:01:13 UTC

nifi git commit: NIFI-4444: - Ensure the /nifi-api/controller redirection filter executes before matching.

Repository: nifi
Updated Branches:
  refs/heads/master 482f37195 -> b7c9c88f9


NIFI-4444:
- Ensure the /nifi-api/controller redirection filter executes before matching.

This closes # 2358.

Signed-off-by: Andy LoPresto <al...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/b7c9c88f
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/b7c9c88f
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/b7c9c88f

Branch: refs/heads/master
Commit: b7c9c88f9f786f9a84b0c1dc34026194010755e2
Parents: 482f371
Author: Matt Gilman <ma...@gmail.com>
Authored: Thu Dec 21 14:54:09 2017 -0500
Committer: Andy LoPresto <al...@gmail.com>
Committed: Tue Jan 2 10:01:03 2018 -0500

----------------------------------------------------------------------
 .../org/apache/nifi/web/api/filter/RedirectResourceFilter.java     | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/b7c9c88f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/filter/RedirectResourceFilter.java
----------------------------------------------------------------------
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 c17df15..f648d72 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 {
 
     /**