Ecosystem/haveno
Ecosystem/haveno
2
1
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-01-03 09:29:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix null price feed listener
Some checks are pending
CI / build (macos-13) (push) Waiting to run
Details
CI / build (ubuntu-latest) (push) Waiting to run
Details
CI / build (windows-latest) (push) Waiting to run
Details
Codacy Coverage Reporter / Publish coverage (push) Waiting to run
Details
CodeQL / Analyze (java) (push) Waiting to run
Details

Browse source
This commit is contained in:
woodser 2024-07-01 08:41:17 -04:00 committed by GitHub
parent 856faafd1c
commit c01d63490f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
core/src/main/java/haveno/core/provider/price/PriceFeedService.java
View file

@ -33,7 +33,6 @@ import haveno.core.monetary.Price;
import haveno.core.monetary.TraditionalMoney; import haveno.core.monetary.TraditionalMoney;
import haveno.core.provider.PriceHttpClient; import haveno.core.provider.PriceHttpClient;
import haveno.core.provider.ProvidersRepository; import haveno.core.provider.ProvidersRepository;
import haveno.core.trade.HavenoUtils;
import haveno.core.trade.statistics.TradeStatistics3; import haveno.core.trade.statistics.TradeStatistics3;
import haveno.core.user.Preferences; import haveno.core.user.Preferences;
import haveno.network.http.HttpClient; import haveno.network.http.HttpClient;
@ -144,15 +143,17 @@ public class PriceFeedService {
public void awaitExternalPrices() { public void awaitExternalPrices() {
CountDownLatch latch = new CountDownLatch(1); CountDownLatch latch = new CountDownLatch(1);
ChangeListener<? super Number> listener = (observable, oldValue, newValue) -> { ChangeListener<? super Number> listener = (observable, oldValue, newValue) -> {
if (hasExternalPrices() && latch.getCount() != 0) latch.countDown(); if (hasExternalPrices()) UserThread.execute(() -> latch.countDown());
}; };
updateCounter.addListener(listener); UserThread.execute(() -> updateCounter.addListener(listener));
if (hasExternalPrices()) { if (hasExternalPrices()) UserThread.execute(() -> latch.countDown());
updateCounter.removeListener(listener); try {
return; latch.await();
} catch (InterruptedException e) {
throw new RuntimeException(e);
} finally {
UserThread.execute(() -> updateCounter.removeListener(listener));
} }
HavenoUtils.awaitLatch(latch);
updateCounter.removeListener(listener);
} }
public boolean hasExternalPrices() { public boolean hasExternalPrices() {
@ -377,17 +378,21 @@ public class PriceFeedService {
*/ */
public synchronized Map<String, MarketPrice> requestAllPrices() throws ExecutionException, InterruptedException, TimeoutException, CancellationException { public synchronized Map<String, MarketPrice> requestAllPrices() throws ExecutionException, InterruptedException, TimeoutException, CancellationException {
CountDownLatch latch = new CountDownLatch(1); CountDownLatch latch = new CountDownLatch(1);
ChangeListener<? super Number> listener = (observable, oldValue, newValue) -> { if (latch.getCount() != 0) latch.countDown(); }; ChangeListener<? super Number> listener = (observable, oldValue, newValue) -> latch.countDown();
updateCounter.addListener(listener); UserThread.execute(() -> updateCounter.addListener(listener));
requestAllPricesError = null; requestAllPricesError = null;
requestPrices(); requestPrices();
UserThread.runAfter(() -> { UserThread.runAfter(() -> {
if (latch.getCount() == 0) return; if (latch.getCount() > 0) requestAllPricesError = "Timeout fetching market prices within 20 seconds";
requestAllPricesError = "Timeout fetching market prices within 20 seconds"; UserThread.execute(() -> latch.countDown());
latch.countDown();
}, 20); }, 20);
HavenoUtils.awaitLatch(latch); try {
updateCounter.removeListener(listener); latch.await();
} catch (InterruptedException e) {
throw new RuntimeException(e);
} finally {
UserThread.execute(() -> updateCounter.removeListener(listener));
}
if (requestAllPricesError != null) throw new RuntimeException(requestAllPricesError); if (requestAllPricesError != null) throw new RuntimeException(requestAllPricesError);
return cache; return cache;
} }