Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-11-27 06:56:26 -05:00
Code Issues Projects Releases Packages Wiki Activity

Add null checks

Browse source
This commit is contained in:
Manfred Karrer 2016-06-03 12:02:24 +02:00
parent 3c5da3007a
commit b1a8cec3f8
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/src/main/java/io/bitsquare/btc/pricefeed/PriceFeed.java
View file

@ -194,8 +194,10 @@ public class PriceFeed {
Futures.addCallback(future, new FutureCallback<MarketPrice>() { Futures.addCallback(future, new FutureCallback<MarketPrice>() {
public void onSuccess(MarketPrice marketPrice) { public void onSuccess(MarketPrice marketPrice) {
UserThread.execute(() -> { UserThread.execute(() -> {
cache.put(marketPrice.currencyCode, marketPrice); if (marketPrice != null && priceConsumer != null) {
priceConsumer.accept(marketPrice.getPrice(type)); cache.put(marketPrice.currencyCode, marketPrice);
priceConsumer.accept(marketPrice.getPrice(type));
}
}); });
} }

5
network/src/main/java/io/bitsquare/p2p/network/Connection.java
View file

@ -696,7 +696,7 @@ public class Connection implements MessageListener {
exceeds = size > MAX_MSG_SIZE_GET_DATA; exceeds = size > MAX_MSG_SIZE_GET_DATA;
else else
exceeds = size > MAX_MSG_SIZE; exceeds = size > MAX_MSG_SIZE;
if (exceeds) if (exceeds)
log.warn("size > MAX_MSG_SIZE. size={}; object={}", size, message); log.warn("size > MAX_MSG_SIZE. size={}; object={}", size, message);
@ -793,7 +793,8 @@ public class Connection implements MessageListener {
} catch (Throwable t) { } catch (Throwable t) {
t.printStackTrace(); t.printStackTrace();
stop(); stop();
sharedModel.handleConnectionException(new Exception(t)); if (sharedModel != null)
sharedModel.handleConnectionException(new Exception(t));
} }
} }
} catch (Throwable t) { } catch (Throwable t) {

4
network/src/main/java/io/bitsquare/p2p/storage/payload/MailboxStoragePayload.java
View file

@ -103,8 +103,8 @@ public final class MailboxStoragePayload implements StoragePayload {
public String toString() { public String toString() {
return "MailboxStoragePayload{" + return "MailboxStoragePayload{" +
"prefixedSealedAndSignedMessage=" + prefixedSealedAndSignedMessage + "prefixedSealedAndSignedMessage=" + prefixedSealedAndSignedMessage +
", senderStoragePublicKey.hashCode()=" + senderPubKeyForAddOperation.hashCode() + ", senderPubKeyForAddOperation.hashCode()=" + (senderPubKeyForAddOperation != null ? senderPubKeyForAddOperation.hashCode() : "null") +
", receiverStoragePublicKey.hashCode()=" + receiverPubKeyForRemoveOperation.hashCode() + ", receiverPubKeyForRemoveOperation.hashCode()=" + (receiverPubKeyForRemoveOperation != null ? receiverPubKeyForRemoveOperation.hashCode() : "null") +
'}'; '}';
} }
} }