From 0d32a3b5ceda8d5664afc72f2a2e98b9403ccc06 Mon Sep 17 00:00:00 2001 From: Ivan Vilata-i-Balaguer Date: Thu, 5 May 2016 10:25:42 +0200 Subject: [PATCH] Move comment closer to timer creation For consistency across classes. --- .../io/bitsquare/p2p/peers/getdata/GetDataRequestHandler.java | 4 ++-- .../io/bitsquare/p2p/peers/getdata/RequestDataHandler.java | 4 ++-- .../bitsquare/p2p/peers/peerexchange/PeerExchangeHandler.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/network/src/main/java/io/bitsquare/p2p/peers/getdata/GetDataRequestHandler.java b/network/src/main/java/io/bitsquare/p2p/peers/getdata/GetDataRequestHandler.java index bb9aebdd8a..fc76ad3e55 100644 --- a/network/src/main/java/io/bitsquare/p2p/peers/getdata/GetDataRequestHandler.java +++ b/network/src/main/java/io/bitsquare/p2p/peers/getdata/GetDataRequestHandler.java @@ -67,8 +67,8 @@ public class GetDataRequestHandler { GetDataResponse getDataResponse = new GetDataResponse(new HashSet<>(dataStorage.getMap().values()), getDataRequest.getNonce()); - if (timeoutTimer == null) { // setup before sending to avoid race conditions - timeoutTimer = UserThread.runAfter(() -> { + if (timeoutTimer == null) { + timeoutTimer = UserThread.runAfter(() -> { // setup before sending to avoid race conditions String errorMessage = "A timeout occurred for getDataResponse:" + getDataResponse + " on connection:" + connection; handleFault(errorMessage, CloseConnectionReason.SEND_MSG_TIMEOUT, connection); diff --git a/network/src/main/java/io/bitsquare/p2p/peers/getdata/RequestDataHandler.java b/network/src/main/java/io/bitsquare/p2p/peers/getdata/RequestDataHandler.java index 773c2cd347..01472b207c 100644 --- a/network/src/main/java/io/bitsquare/p2p/peers/getdata/RequestDataHandler.java +++ b/network/src/main/java/io/bitsquare/p2p/peers/getdata/RequestDataHandler.java @@ -88,8 +88,8 @@ public class RequestDataHandler implements MessageListener { else getDataRequest = new GetUpdatedDataRequest(networkNode.getNodeAddress(), nonce); - if (timeoutTimer == null) { // setup before sending to avoid race conditions - timeoutTimer = UserThread.runAfter(() -> { + if (timeoutTimer == null) { + timeoutTimer = UserThread.runAfter(() -> { // setup before sending to avoid race conditions if (!stopped) { String errorMessage = "A timeout occurred at sending getDataRequest:" + getDataRequest + " on nodeAddress:" + nodeAddress; diff --git a/network/src/main/java/io/bitsquare/p2p/peers/peerexchange/PeerExchangeHandler.java b/network/src/main/java/io/bitsquare/p2p/peers/peerexchange/PeerExchangeHandler.java index 73cc630f8c..8c2db58afe 100644 --- a/network/src/main/java/io/bitsquare/p2p/peers/peerexchange/PeerExchangeHandler.java +++ b/network/src/main/java/io/bitsquare/p2p/peers/peerexchange/PeerExchangeHandler.java @@ -85,8 +85,8 @@ class PeerExchangeHandler implements MessageListener { if (networkNode.getNodeAddress() != null) { GetPeersRequest getPeersRequest = new GetPeersRequest(networkNode.getNodeAddress(), nonce, peerManager.getConnectedNonSeedNodeReportedPeers(nodeAddress)); - if (timeoutTimer == null) { // setup before sending to avoid race conditions - timeoutTimer = UserThread.runAfter(() -> { + if (timeoutTimer == null) { + timeoutTimer = UserThread.runAfter(() -> { // setup before sending to avoid race conditions if (!stopped) { String errorMessage = "A timeout occurred at sending getPeersRequest:" + getPeersRequest + " for nodeAddress:" + nodeAddress; log.info(errorMessage + " / PeerExchangeHandler=" +