Repository: incubator-wave Updated Branches: refs/heads/fix/WAVE-413 [created] 0f38c2b6c
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/0f38c2b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/0f38c2b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/0f38c2b6 Branch: refs/heads/fix/WAVE-413 Commit: 0f38c2b6c0d6d1dd05e1d4c08f060c474e865071 Parents: 263e81a Author: Yuri Zelikov <[email protected]> Authored: Mon Aug 25 01:23:12 2014 +0300 Committer: Yuri Zelikov <[email protected]> Committed: Mon Aug 25 01:23:12 2014 +0300 ---------------------------------------------------------------------- src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/0f38c2b6/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..071f60e 100755 --- a/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java +++ b/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java @@ -400,10 +400,6 @@ public class ServerRpcProvider { 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 +538,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 +579,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(); }
