From e7967cc0e11f70375df65e0cede6a1c30d05b134 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Sun, 20 Mar 2016 19:08:37 +0100
Subject: [PATCH] Add null checks

---
 core/src/main/java/io/bitsquare/trade/offer/Offer.java          | 2 +-
 network/src/main/java/io/bitsquare/p2p/network/Connection.java  | 1 +
 .../src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/io/bitsquare/trade/offer/Offer.java b/core/src/main/java/io/bitsquare/trade/offer/Offer.java
index 92fcef3d30..1b50251aa4 100644
--- a/core/src/main/java/io/bitsquare/trade/offer/Offer.java
+++ b/core/src/main/java/io/bitsquare/trade/offer/Offer.java
@@ -288,7 +288,7 @@ public final class Offer implements StoragePayload, RequiresOwnerIsOnlinePayload
 
     @Override
     public PublicKey getOwnerPubKey() {
-        return pubKeyRing.getSignaturePubKey();
+        return pubKeyRing != null ? pubKeyRing.getSignaturePubKey() : null;
     }
 
     public long getProtocolVersion() {
diff --git a/network/src/main/java/io/bitsquare/p2p/network/Connection.java b/network/src/main/java/io/bitsquare/p2p/network/Connection.java
index 319ef0486f..4f946b20ff 100644
--- a/network/src/main/java/io/bitsquare/p2p/network/Connection.java
+++ b/network/src/main/java/io/bitsquare/p2p/network/Connection.java
@@ -540,6 +540,7 @@ public class Connection implements MessageListener {
             } else if (e instanceof EOFException || e instanceof StreamCorruptedException) {
                 closeConnectionReason = CloseConnectionReason.TERMINATED;
             } else {
+                // TODO sometimes we get StreamCorruptedException, OptionalDataException, IllegalStateException
                 closeConnectionReason = CloseConnectionReason.UNKNOWN_EXCEPTION;
                 log.warn("Unknown reason for exception at socket {}\n\tconnection={}\n\tException=",
                         socket.toString(), this, e.toString());
diff --git a/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java b/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java
index dea147e113..561a3bf316 100644
--- a/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java
+++ b/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java
@@ -443,7 +443,7 @@ public class P2PDataStorage implements MessageListener, ConnectionListener {
                 result = expirableMailboxStoragePayload.receiverPubKeyForRemoveOperation.equals(protectedStorageEntry.ownerPubKey);
         } else {
             result = protectedStorageEntry != null && protectedStorageEntry.getStoragePayload() != null &&
-                    protectedStorageEntry.getStoragePayload().getOwnerPubKey().equals(protectedStorageEntry.ownerPubKey);
+                    protectedStorageEntry.ownerPubKey.equals(protectedStorageEntry.getStoragePayload().getOwnerPubKey());
         }
 
         if (!result)