From cfd2e837e9c9716f2b623ef941550773471524c0 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Mon, 16 May 2016 21:32:19 +0200 Subject: [PATCH] Add null check --- gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java index d076d09e5e..9251b206e0 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java @@ -863,7 +863,11 @@ public class MainViewModel implements ViewModel { private void updateLockedBalance() { Coin sum = Coin.valueOf(tradeManager.getLockedTradeStream() - .mapToLong(trade -> walletService.getOrCreateAddressEntry(trade.getId(), AddressEntry.Context.MULTI_SIG).getLockedTradeAmount().getValue()) + .mapToLong(trade -> { + //AddressEntry addressEntry = walletService.getOrCreateAddressEntry(trade.getId(), AddressEntry.Context.MULTI_SIG); + Coin lockedTradeAmount = walletService.getOrCreateAddressEntry(trade.getId(), AddressEntry.Context.MULTI_SIG).getLockedTradeAmount(); + return lockedTradeAmount != null ? lockedTradeAmount.getValue() : 0; + }) .sum()); lockedBalance.set(formatter.formatCoinWithCode(sum)); }