fix: changes made for listenForWallet method to prevent NullPointerException

Author: AndryRadchenko

bitmex-adapter/src/com/bookmap/plugins/layer0/bitmex/Provider.java

@@ -892,27 +892,31 @@ public void listenForPosition(UnitPosition pos) {
 
 	public void listenForWallet(UnitWallet wallet) {
 		BalanceInfo.BalanceInCurrency currentBic = balanceMap.get(wallet.getCurrency());
-		BalanceInfo.BalanceInCurrency newBic;
+		String currency = wallet.getCurrency();
 		if (currentBic == null) {// no current balance balance
-			newBic = new BalanceInfo.BalanceInCurrency(0.0, 0.0, 0.0, 0.0, 0.0,
-					null, null);
+			currentBic = new BalanceInfo.BalanceInCurrency(0.0, 0.0, 0.0, 0.0, 0.0,
+					currency, null);
 		}
 
 		long tempMultiplier = 100000000;// temp
 		// PNLs and NetLiquidityValue are taken from UnitMargin topic
-		Double netLiquidityValue = 0.0;// to be calculated
-		String currency = wallet.getCurrency();
+		// Double netLiquidityValue = 0.0;// to be calculated
+		
 		Double rateToBase = null;
 
-		newBic = new BalanceInfo.BalanceInCurrency(
+		currentBic = new BalanceInfo.BalanceInCurrency(
 				wallet.getAmount() == null ? currentBic.balance : (double) wallet.getAmount() / tempMultiplier,
-				currentBic.realizedPnl, currentBic.unrealizedPnl,
-				wallet.getPrevAmount() == null ? currentBic.previousDayBalance : (double) wallet.getPrevAmount() / tempMultiplier,
-				netLiquidityValue == null ? currentBic.netLiquidityValue : netLiquidityValue, currentBic.currency,
+				currentBic.realizedPnl,
+				currentBic.unrealizedPnl,
+				wallet.getPrevAmount() == null ? currentBic.previousDayBalance
+						: (double) wallet.getPrevAmount() / tempMultiplier,
+				// netLiquidityValue == null ? currentBic.netLiquidityValue :
+				// netLiquidityValue,
+				currentBic.netLiquidityValue,
+				currency,
 				rateToBase == null ? currentBic.rateToBase : rateToBase);
 
-		balanceMap.remove(currency);
-		balanceMap.put(currency, newBic);
+		balanceMap.put(currency, currentBic);
 		BalanceInfo info = new BalanceInfo(new ArrayList<BalanceInfo.BalanceInCurrency>(balanceMap.values()));
 		tradingListeners.forEach(l -> l.onBalance(info));
 	}
@@ -921,22 +925,22 @@ public void listenForMargin(UnitMargin margin) {
 		long tempMultiplier = 100000000;// temp
 		String currency = margin.getCurrency();
 		BalanceInfo.BalanceInCurrency currentBic = balanceMap.get(margin.getCurrency());
-		BalanceInfo.BalanceInCurrency newBic;
 		if (currentBic == null) {// no current balance balance
-			newBic = new BalanceInfo.BalanceInCurrency(0.0, 0.0, 0.0, 0.0, 0.0, margin.getCurrency(), null);
-		} else {
-			newBic = new BalanceInfo.BalanceInCurrency(currentBic.balance,
-					margin.getRealisedPnl() == null ? currentBic.realizedPnl
-							: (double) margin.getRealisedPnl() / tempMultiplier,
-					margin.getUnrealisedPnl() == null ? currentBic.unrealizedPnl
-							: (double) margin.getUnrealisedPnl() / tempMultiplier,
-					currentBic.previousDayBalance, margin.getAvailableMargin() == null ? currentBic.netLiquidityValue
-							: (double) margin.getAvailableMargin() / tempMultiplier,
-					currency, currentBic.rateToBase);
+			currentBic = new BalanceInfo.BalanceInCurrency(0.0, 0.0, 0.0, 0.0, 0.0, currency, null);
 		}
-
-		balanceMap.remove(currency);
-		balanceMap.put(currency, newBic);
+		currentBic = new BalanceInfo.BalanceInCurrency(
+				currentBic.balance,
+				margin.getRealisedPnl() == null ? currentBic.realizedPnl
+						: (double) margin.getRealisedPnl() / tempMultiplier,
+				margin.getUnrealisedPnl() == null ? currentBic.unrealizedPnl
+						: (double) margin.getUnrealisedPnl() / tempMultiplier,
+				currentBic.previousDayBalance,
+				margin.getAvailableMargin() == null ? currentBic.netLiquidityValue
+						: (double) margin.getAvailableMargin() / tempMultiplier,
+				currency,
+				currentBic.rateToBase);
+
+		balanceMap.put(currency, currentBic);
 		BalanceInfo info = new BalanceInfo(new ArrayList<BalanceInfo.BalanceInCurrency>(balanceMap.values()));
 		tradingListeners.forEach(l -> l.onBalance(info));
 	}