From 6ccdae5a8ca65e52bcfdbc3deab20a8c27fa65e5 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 27 Nov 2013 15:42:18 +0100 Subject: [PATCH] =?UTF-8?q?IDEA-111388=20Built-in=20server=20not=20"availa?= =?UTF-8?q?ble=20external"=20=E2=80=94=20it=20is=20unclear=20that=20port?= =?UTF-8?q?=20number=20must=20be=20also=20changed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platform/platform-impl/src/org/jetbrains/io/BuiltInServer.java | 2 +- platform/platform-impl/src/org/jetbrains/io/SubServer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/org/jetbrains/io/BuiltInServer.java b/platform/platform-impl/src/org/jetbrains/io/BuiltInServer.java index a1bfcc0890ea..08e3aa8893ce 100644 --- a/platform/platform-impl/src/org/jetbrains/io/BuiltInServer.java +++ b/platform/platform-impl/src/org/jetbrains/io/BuiltInServer.java @@ -94,7 +94,7 @@ public class BuiltInServer implements Disposable { int customPortServerManagerPort = customPortServerManager.getPort(); SubServer subServer = new SubServer(customPortServerManager, eventLoopGroup); Disposer.register(this, subServer); - if (customPortServerManagerPort != firstPort && customPortServerManagerPort != port) { + if (customPortServerManager.isAvailableExternally() || (customPortServerManagerPort != firstPort && customPortServerManagerPort != port)) { subServer.bind(customPortServerManagerPort); } } diff --git a/platform/platform-impl/src/org/jetbrains/io/SubServer.java b/platform/platform-impl/src/org/jetbrains/io/SubServer.java index 9f14762714b6..e5e35975116a 100644 --- a/platform/platform-impl/src/org/jetbrains/io/SubServer.java +++ b/platform/platform-impl/src/org/jetbrains/io/SubServer.java @@ -37,7 +37,7 @@ final class SubServer implements CustomPortServerManager.CustomPortService, Disp } public boolean bind(int port) { - if (port == BuiltInServerManager.getInstance().getPort()) { + if (!user.isAvailableExternally() && port == BuiltInServerManager.getInstance().getPort()) { return true; }