Repository: nifi Updated Branches: refs/heads/master 776a00b0b -> 7c19796eb
NIFI-3561: Fix WS port forwarding Fixed service instance lookup to use local port so that it works when it is accessed through port forwarding. This fixes: #1568 Signed-off-by: Andre F de Miranda <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/7c19796e Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/7c19796e Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/7c19796e Branch: refs/heads/master Commit: 7c19796eb22ced9aba703e52e76e58450e34d018 Parents: 776a00b Author: Koji Kawamura <[email protected]> Authored: Tue Mar 7 17:08:47 2017 +0900 Committer: Andre F de Miranda <[email protected]> Committed: Tue Apr 11 21:27:53 2017 +1000 ---------------------------------------------------------------------- .../java/org/apache/nifi/websocket/jetty/JettyWebSocketServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/7c19796e/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketServer.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketServer.java b/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketServer.java index 267e7d1..71e60a9 100644 --- a/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketServer.java +++ b/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketServer.java @@ -127,7 +127,7 @@ public class JettyWebSocketServer extends AbstractJettyWebSocketService implemen @Override public Object createWebSocket(ServletUpgradeRequest servletUpgradeRequest, ServletUpgradeResponse servletUpgradeResponse) { final URI requestURI = servletUpgradeRequest.getRequestURI(); - final int port = requestURI.getPort(); + final int port = servletUpgradeRequest.getLocalPort(); final JettyWebSocketServer service = portToControllerService.get(port); if (service == null) {
