Repository: incubator-wave Updated Branches: refs/heads/fulltextsearch 5193da8c4 -> 65653a59e (forced update)
Fixes WAVE-413 - Windows Server can only offer connections to localhost. Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/543c3cbf Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/543c3cbf Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/543c3cbf Branch: refs/heads/fulltextsearch Commit: 543c3cbfc6501a0536202d3b15e88f83fcec17f2 Parents: 5b19ee5 Author: Yuri Zelikov <[email protected]> Authored: Mon Aug 25 01:23:12 2014 +0300 Committer: Yuri Zelikov <[email protected]> Committed: Mon Aug 25 01:37:41 2014 +0300 ---------------------------------------------------------------------- src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/543c3cbf/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java b/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java index 6d8ec04..deaf01b 100755 --- a/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java +++ b/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java @@ -399,11 +399,6 @@ public class ServerRpcProvider { context.addEventListener(contextListener); context.addFilter(GuiceFilter.class, "/*", EnumSet.allOf(DispatcherType.class)); context.addFilter(GzipFilter.class, "/webclient/*", EnumSet.allOf(DispatcherType.class)); - String[] hosts = new String[httpAddresses.length]; - for (int i=0; i < httpAddresses.length; i++) { - hosts[i] = httpAddresses[i].getHostName(); - } - context.addVirtualHosts(hosts); httpServer.setHandler(context); httpServer.start(); @@ -542,7 +537,7 @@ public class ServerRpcProvider { } else { connector = new ServerConnector(httpServer); } - connector.setHost(address.getHostName()); + connector.setHost(address.getAddress().getHostAddress()); connector.setPort(address.getPort()); connector.setIdleTimeout(0); list.add(connector); @@ -583,7 +578,7 @@ public class ServerRpcProvider { @Override public Object createWebSocket(ServletUpgradeRequest req, ServletUpgradeResponse resp) { ParticipantId loggedInUser = - provider.sessionManager.getLoggedInUser((HttpSession)req.getSession()); + provider.sessionManager.getLoggedInUser(req.getSession()); return new WebSocketConnection(loggedInUser, provider).getWebSocketServerChannel(); }
