Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3003 from reftel/feature/report_address_when_bind_fails 

Improve error message when binding to in-use port
This commit is contained in:
Joakim Erdfelt 2018-10-19 10:34:00 -05:00 committed by GitHub
parent a10c84c40a 37a85152eb
commit e52d2047fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java
View File

@ -20,6 +20,7 @@ package org.eclipse.jetty.server;
import java.io.Closeable; import java.io.Closeable;
import java.io.IOException; import java.io.IOException;
import java.net.BindException;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.ServerSocket; import java.net.ServerSocket;
import java.net.Socket; import java.net.Socket;
@ -336,7 +337,11 @@ public class ServerConnector extends AbstractNetworkConnector
InetSocketAddress bindAddress = getHost() == null ? new InetSocketAddress(getPort()) : new InetSocketAddress(getHost(), getPort()); InetSocketAddress bindAddress = getHost() == null ? new InetSocketAddress(getPort()) : new InetSocketAddress(getHost(), getPort());
serverChannel.socket().setReuseAddress(getReuseAddress()); serverChannel.socket().setReuseAddress(getReuseAddress());
serverChannel.socket().bind(bindAddress, getAcceptQueueSize()); try {
serverChannel.socket().bind(bindAddress, getAcceptQueueSize());
} catch (BindException e) {
throw new IOException("Failed to bind to " + bindAddress, e);
}
} }
return serverChannel; return serverChannel;

34
jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorTest.java
View File

@ -33,8 +33,10 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.net.BindException;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.net.Socket; import java.net.Socket;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
@ -55,6 +57,7 @@ import org.eclipse.jetty.server.handler.HandlerList;
import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.log.StacklessLogging; import org.eclipse.jetty.util.log.StacklessLogging;
import org.hamcrest.Matchers; import org.hamcrest.Matchers;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
public class ServerConnectorTest public class ServerConnectorTest
@ -296,11 +299,30 @@ public class ServerConnectorTest
server.stop(); server.stop();
assertThat(connector.getTransport(),Matchers.nullValue()); assertThat(connector.getTransport(),Matchers.nullValue());
}
@Test
public void testBindToAddressWhichIsInUse() throws Exception {
try (ServerSocket socket = new ServerSocket(0)) {
final int port = socket.getLocalPort();
Server server = new Server();
ServerConnector connector = new ServerConnector(server);
connector.setPort(port);
server.addConnector(connector);
HandlerList handlers = new HandlerList();
handlers.addHandler(new DefaultHandler());
server.setHandler(handlers);
try {
server.start();
Assertions.fail("No exception thrown");
} catch (IOException e) {
assertThat(e.getCause(), Matchers.instanceOf(BindException.class));
assertThat(e.getMessage(), Matchers.containsString("0.0.0.0:" + port));
}
}
} }
} }