Merge remote-tracking branch 'origin/Development' into Development

This commit is contained in:
Manfred Karrer 2016-06-15 22:05:55 +02:00
commit 0519ab4f8a

View File

@ -31,7 +31,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
// Run in UserThread
public abstract class NetworkNode implements MessageListener {
private static final Logger log = LoggerFactory.getLogger(NetworkNode.class);
private static final int CREATE_SOCKET_TIMEOUT_MILLIS = 5000;
private static final int CREATE_SOCKET_TIMEOUT_MILLIS = 10000;
final int servicePort;