Verify closedTradableManager.getTradableById return value is a Trade …

…instance This change requested at #4711 (comment)
bisq-network · Oct 31, 2020 · fcdfc68 · fcdfc68
1 parent c27d5a6
commit fcdfc68
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/core/src/main/java/bisq/core/api/CoreTradesService.java b/core/src/main/java/bisq/core/api/CoreTradesService.java
@@ -21,6 +21,7 @@
 import bisq.core.btc.wallet.BtcWalletService;
 import bisq.core.offer.Offer;
 import bisq.core.offer.takeoffer.TakeOfferModel;
+import bisq.core.trade.Tradable;
 import bisq.core.trade.Trade;
 import bisq.core.trade.TradeManager;
 import bisq.core.trade.TradeUtil;
@@ -199,7 +200,8 @@ private Optional<Trade> getOpenTrade(String tradeId) {
     }
 
     private Optional<Trade> getClosedTrade(String tradeId) {
-        return closedTradableManager.getTradableById(tradeId).map(value -> (Trade) value);
+        Optional<Tradable> tradable = closedTradableManager.getTradableById(tradeId);
+        return tradable.filter((t) -> t instanceof Trade).map(value -> (Trade) value);
     }
 
     private boolean isFollowingBuyerProtocol(Trade trade) {