don't instantiate web server if isUnitTestMode

This commit is contained in:
Vladimir Krivosheev
2012-12-04 20:13:20 +04:00
parent b78048d495
commit eef2156df0
@@ -12,6 +12,7 @@ import org.jboss.netty.channel.ChannelFutureListener;
import org.jboss.netty.channel.ChannelPipeline;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.io.WebServer;
class WebServerManagerImpl extends WebServerManager {
@@ -24,14 +25,17 @@ class WebServerManagerImpl extends WebServerManager {
private int detectedPortNumber = -1;
private final WebServer server = new WebServer();
@Nullable
private WebServer server;
public int getPort() {
return detectedPortNumber == -1 ? getDefaultPort() : detectedPortNumber;
}
public void addClosingListener(ChannelFutureListener listener) {
server.addClosingListener(listener);
if (server != null) {
server.addClosingListener(listener);
}
}
private static int getDefaultPort() {
@@ -45,6 +49,8 @@ class WebServerManagerImpl extends WebServerManager {
return;
}
LOG.assertTrue(server == null);
server = new WebServer();
application.executeOnPooledThread(new Runnable() {
@Override
public void run() {
@@ -73,8 +79,10 @@ class WebServerManagerImpl extends WebServerManager {
@Override
public void disposeComponent() {
server.stop();
LOG.info("web server stopped");
if (server != null) {
server.stop();
LOG.info("web server stopped");
}
}
@NotNull