From 31f6c0bf50c37b7014c498fb9a7c6d303e0f3aa8 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Tue, 22 Mar 2016 13:46:27 +0000
Subject: [PATCH] More logging for MessageQueueManagerImpl. #272

---
 .../clients/MessageQueueManagerImpl.java          | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/briar-core/src/org/briarproject/clients/MessageQueueManagerImpl.java b/briar-core/src/org/briarproject/clients/MessageQueueManagerImpl.java
index 5dadef907e..693f4768e1 100644
--- a/briar-core/src/org/briarproject/clients/MessageQueueManagerImpl.java
+++ b/briar-core/src/org/briarproject/clients/MessageQueueManagerImpl.java
@@ -135,9 +135,20 @@ class MessageQueueManagerImpl implements MessageQueueManager {
 
 		MessageId popIncomingMessageId() {
 			Iterator<Entry<Long, MessageId>> it = pending.entrySet().iterator();
-			if (!it.hasNext()) return null;
+			if (!it.hasNext()) {
+				LOG.info("No pending messages");
+				return null;
+			}
 			Entry<Long, MessageId> e = it.next();
-			if (!e.getKey().equals(incomingPosition)) return null;
+			if (!e.getKey().equals(incomingPosition)) {
+				if (LOG.isLoggable(INFO)) {
+					LOG.info("First pending message is " + e.getKey() + ", "
+							+ " expecting " + incomingPosition);
+				}
+				return null;
+			}
+			if (LOG.isLoggable(INFO))
+				LOG.info("Removing pending message " + e.getKey());
 			it.remove();
 			incomingPosition++;
 			return e.getValue();
-- 
GitLab