Server: Extract isStopped check to method

nwfella · Feb 11, 2023 · 2127e07 · 2127e07
1 parent 3cd24d6
commit 2127e07
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/p2p/src/main/java/bisq/network/p2p/network/Server.java b/p2p/src/main/java/bisq/network/p2p/network/Server.java
@@ -72,11 +72,11 @@ public void start() {
  public void run() {
  try {
  try {
- while (!isStopped.get() && !Thread.currentThread().isInterrupted()) {
+ while (isServerActive()) {
  log.debug("Ready to accept new clients on port " + localPort);
  final Socket socket = serverSocket.accept();
 
- if (!isStopped.get() && !Thread.currentThread().isInterrupted()) {
+ if (isServerActive()) {
  log.debug("Accepted new client on localPort/port " + socket.getLocalPort() + "/" + socket.getPort());
  InboundConnection connection = new InboundConnection(socket,
  messageListener,
@@ -90,7 +90,7 @@ public void run() {
  + "\nconnection.uid={}", serverSocket.getLocalPort(), socket.getPort(), connection.getUid()
  + "\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n");
 
- if (!isStopped.get())
+ if (isServerActive())
  connections.add(connection);
  else
  connection.shutDown(CloseConnectionReason.APP_SHUT_DOWN);
@@ -130,4 +130,8 @@ public void shutDown() {
  log.warn("stopped already called ast shutdown");
  }
  }
+
+ private boolean isServerActive() {
+ return !isStopped.get() && !Thread.currentThread().isInterrupted();
+ }
 }