From ea818cf66b650f182efaed29ddf03e01150b18af Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Sun, 22 May 2016 00:24:38 +0200
Subject: [PATCH] Improve logging, fix toString

---
 .../io/bitsquare/p2p/storage/P2PDataStorage.java | 16 +++++++++++++---
 .../storage/payload/MailboxStoragePayload.java   |  2 +-
 .../storageentry/ProtectedStorageEntry.java      |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

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 ce8d397724..b9b268d645 100644
--- a/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java
+++ b/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java
@@ -386,11 +386,11 @@ public class P2PDataStorage implements MessageListener, ConnectionListener {
 
     private boolean isSequenceNrValid(int newSequenceNumber, ByteArray hashOfData) {
         if (sequenceNumberMap.containsKey(hashOfData)) {
-            Integer storedSequenceNumber = sequenceNumberMap.get(hashOfData).sequenceNr;
+            int storedSequenceNumber = sequenceNumberMap.get(hashOfData).sequenceNr;
             if (newSequenceNumber >= storedSequenceNumber) {
                 return true;
             } else {
-                log.info("Sequence number is invalid. sequenceNumber = "
+                log.warn("Sequence number is invalid. sequenceNumber = "
                         + newSequenceNumber + " / storedSequenceNumber=" + storedSequenceNumber + "\n" +
                         "That can happen if the data owner gets an old delayed data storage message.");
                 return false;
@@ -402,9 +402,19 @@ public class P2PDataStorage implements MessageListener, ConnectionListener {
 
     private boolean hasSequenceNrIncreased(int newSequenceNumber, ByteArray hashOfData) {
         if (sequenceNumberMap.containsKey(hashOfData)) {
-            Integer storedSequenceNumber = sequenceNumberMap.get(hashOfData).sequenceNr;
+            int storedSequenceNumber = sequenceNumberMap.get(hashOfData).sequenceNr;
             if (newSequenceNumber > storedSequenceNumber) {
                 return true;
+            } else if (newSequenceNumber == storedSequenceNumber) {
+                if (newSequenceNumber == 0) {
+                    log.trace("Sequence number is equal to the stored one and both are 0." +
+                            "That is expected for messages which never got updated (mailbox msg).");
+                    return false;
+                } else {
+                    log.trace("Sequence number is equal to the stored one. sequenceNumber = "
+                            + newSequenceNumber + " / storedSequenceNumber=" + storedSequenceNumber);
+                    return false;
+                }
             } else {
                 log.warn("Sequence number is invalid. sequenceNumber = "
                         + newSequenceNumber + " / storedSequenceNumber=" + storedSequenceNumber + "\n" +
diff --git a/network/src/main/java/io/bitsquare/p2p/storage/payload/MailboxStoragePayload.java b/network/src/main/java/io/bitsquare/p2p/storage/payload/MailboxStoragePayload.java
index bb6e4cc04e..fd0744e151 100644
--- a/network/src/main/java/io/bitsquare/p2p/storage/payload/MailboxStoragePayload.java
+++ b/network/src/main/java/io/bitsquare/p2p/storage/payload/MailboxStoragePayload.java
@@ -101,7 +101,7 @@ public final class MailboxStoragePayload implements StoragePayload {
 
     @Override
     public String toString() {
-        return "ExpirableMailboxPayload{" +
+        return "MailboxStoragePayload{" +
                 "prefixedSealedAndSignedMessage=" + prefixedSealedAndSignedMessage +
                 ", senderStoragePublicKey.hashCode()=" + senderPubKeyForAddOperation.hashCode() +
                 ", receiverStoragePublicKey.hashCode()=" + receiverPubKeyForRemoveOperation.hashCode() +
diff --git a/network/src/main/java/io/bitsquare/p2p/storage/storageentry/ProtectedStorageEntry.java b/network/src/main/java/io/bitsquare/p2p/storage/storageentry/ProtectedStorageEntry.java
index fdfc901a76..c75d5bfbae 100644
--- a/network/src/main/java/io/bitsquare/p2p/storage/storageentry/ProtectedStorageEntry.java
+++ b/network/src/main/java/io/bitsquare/p2p/storage/storageentry/ProtectedStorageEntry.java
@@ -69,7 +69,7 @@ public class ProtectedStorageEntry implements Payload {
 
     @Override
     public String toString() {
-        return "ProtectedData{" +
+        return "ProtectedStorageEntry{" +
                 "expirablePayload=" + storagePayload +
                 ", timeStamp=" + timeStamp +
                 ", sequenceNumber=" + sequenceNumber +