From 9506bfd17deda180f0d76a6cea47897c7c147600 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Tue, 19 Jan 2016 19:15:58 +0100 Subject: [PATCH] Remove wrong thread names --- core/src/main/java/io/bitsquare/btc/WalletService.java | 2 -- core/src/main/java/io/bitsquare/trade/offer/OpenOffer.java | 2 -- .../main/java/io/bitsquare/trade/offer/OpenOfferManager.java | 2 -- .../trade/protocol/availability/OfferAvailabilityProtocol.java | 2 -- core/src/main/java/io/bitsquare/user/Preferences.java | 2 +- .../src/main/java/io/bitsquare/p2p/network/TorNetworkNode.java | 1 - 6 files changed, 1 insertion(+), 10 deletions(-) diff --git a/core/src/main/java/io/bitsquare/btc/WalletService.java b/core/src/main/java/io/bitsquare/btc/WalletService.java index 7a8199896b..f7b9a2a789 100644 --- a/core/src/main/java/io/bitsquare/btc/WalletService.java +++ b/core/src/main/java/io/bitsquare/btc/WalletService.java @@ -29,7 +29,6 @@ import io.bitsquare.common.UserThread; import io.bitsquare.common.handlers.ErrorMessageHandler; import io.bitsquare.common.handlers.ExceptionHandler; import io.bitsquare.common.handlers.ResultHandler; -import io.bitsquare.common.util.Utilities; import io.bitsquare.user.Preferences; import javafx.beans.property.*; import org.bitcoinj.core.*; @@ -118,7 +117,6 @@ public class WalletService { Threading.USER_THREAD = UserThread.getExecutor(); Timer timeoutTimer = UserThread.runAfter(() -> { - Utilities.setThreadName("WalletService:StartupTimeout"); exceptionHandler.handleException(new TimeoutException("Wallet did not initialize in " + STARTUP_TIMEOUT_SEC / 1000 + " seconds.")); }, STARTUP_TIMEOUT_SEC); diff --git a/core/src/main/java/io/bitsquare/trade/offer/OpenOffer.java b/core/src/main/java/io/bitsquare/trade/offer/OpenOffer.java index a92da2eeb8..a9b59819d4 100644 --- a/core/src/main/java/io/bitsquare/trade/offer/OpenOffer.java +++ b/core/src/main/java/io/bitsquare/trade/offer/OpenOffer.java @@ -19,7 +19,6 @@ package io.bitsquare.trade.offer; import io.bitsquare.app.Version; import io.bitsquare.common.UserThread; -import io.bitsquare.common.util.Utilities; import io.bitsquare.storage.Storage; import io.bitsquare.trade.Tradable; import io.bitsquare.trade.TradableList; @@ -99,7 +98,6 @@ public class OpenOffer implements Tradable, Serializable { stopTimeout(); timeoutTimer = UserThread.runAfter(() -> { - Utilities.setThreadName("OpenOffer:Timeout"); log.info("Timeout reached"); if (state == State.RESERVED) setState(State.AVAILABLE); diff --git a/core/src/main/java/io/bitsquare/trade/offer/OpenOfferManager.java b/core/src/main/java/io/bitsquare/trade/offer/OpenOfferManager.java index a6e1e02475..2eacedc0f9 100644 --- a/core/src/main/java/io/bitsquare/trade/offer/OpenOfferManager.java +++ b/core/src/main/java/io/bitsquare/trade/offer/OpenOfferManager.java @@ -24,7 +24,6 @@ import io.bitsquare.common.UserThread; import io.bitsquare.common.crypto.KeyRing; import io.bitsquare.common.handlers.ErrorMessageHandler; import io.bitsquare.common.handlers.ResultHandler; -import io.bitsquare.common.util.Utilities; import io.bitsquare.p2p.Address; import io.bitsquare.p2p.FirstPeerAuthenticatedListener; import io.bitsquare.p2p.Message; @@ -149,7 +148,6 @@ public class OpenOfferManager { TimerTask timerTask = new TimerTask() { @Override public void run() { - Utilities.setThreadName("RepublishOffers"); UserThread.execute(() -> rePublishOffers()); try { } catch (Throwable t) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/OfferAvailabilityProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/OfferAvailabilityProtocol.java index 0cea14232f..6e2e4b7b83 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/availability/OfferAvailabilityProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/OfferAvailabilityProtocol.java @@ -21,7 +21,6 @@ import io.bitsquare.common.UserThread; import io.bitsquare.common.handlers.ErrorMessageHandler; import io.bitsquare.common.handlers.ResultHandler; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.common.util.Utilities; import io.bitsquare.p2p.Message; import io.bitsquare.p2p.messaging.DecryptedMailListener; import io.bitsquare.trade.offer.Offer; @@ -138,7 +137,6 @@ public class OfferAvailabilityProtocol { stopTimeout(); timeoutTimer = UserThread.runAfter(() -> { - Utilities.setThreadName("OfferAvailabilityProtocol:Timeout"); log.warn("Timeout reached"); model.offer.setState(Offer.State.OFFERER_OFFLINE); errorMessageHandler.handleErrorMessage("Timeout reached: Peer has not responded."); diff --git a/core/src/main/java/io/bitsquare/user/Preferences.java b/core/src/main/java/io/bitsquare/user/Preferences.java index 114ec9ee81..4bdc2e8aae 100644 --- a/core/src/main/java/io/bitsquare/user/Preferences.java +++ b/core/src/main/java/io/bitsquare/user/Preferences.java @@ -55,8 +55,8 @@ public class Preferences implements Serializable { )); transient static final private ArrayList blockChainExplorersMainNet = new ArrayList<>(Arrays.asList( - new BlockChainExplorer("Tradeblock.com", "https://tradeblock.com/bitcoin/tx/", "https://tradeblock.com/bitcoin/address/"), new BlockChainExplorer("Blocktrail", "https://www.blocktrail.com/BTC/tx/", "https://www.blocktrail.com/BTC/address/"), + new BlockChainExplorer("Tradeblock.com", "https://tradeblock.com/bitcoin/tx/", "https://tradeblock.com/bitcoin/address/"), new BlockChainExplorer("Blockchain.info", "https://blockchain.info/tx/", "https://blockchain.info/address/"), new BlockChainExplorer("Blockexplorer", "https://blockexplorer.com/tx/", "https://blockexplorer.com/address/"), new BlockChainExplorer("Blockr.io", "https://btc.blockr.io/tx/info/", "https://btc.blockr.io/address/info/"), diff --git a/network/src/main/java/io/bitsquare/p2p/network/TorNetworkNode.java b/network/src/main/java/io/bitsquare/p2p/network/TorNetworkNode.java index 46aabb4b86..ff084bcb70 100644 --- a/network/src/main/java/io/bitsquare/p2p/network/TorNetworkNode.java +++ b/network/src/main/java/io/bitsquare/p2p/network/TorNetworkNode.java @@ -118,7 +118,6 @@ public class TorNetworkNode extends NetworkNode { if (executorService != null) { executorService.submit(() -> { - Utilities.setThreadName("TorNetworkNodeShutDownSuperClass"); UserThread.execute(() -> { // We want to stay in UserThread super.shutDown(() -> {