From 0a0245da0e0c015e2be8dd28c388131947abf8fc Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Thu, 30 Jan 2020 13:20:39 +0100
Subject: [PATCH] Fixed incorrect error handling, upgraded appearance of this
 processor

---
 .../MessageStatusChangeProcessor.java         | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/main/java/envoy/server/processors/MessageStatusChangeProcessor.java b/src/main/java/envoy/server/processors/MessageStatusChangeProcessor.java
index 7a659e0..b16c344 100644
--- a/src/main/java/envoy/server/processors/MessageStatusChangeProcessor.java
+++ b/src/main/java/envoy/server/processors/MessageStatusChangeProcessor.java
@@ -33,24 +33,20 @@ public class MessageStatusChangeProcessor implements ObjectProcessor<MessageStat
 	@Override
 	public void process(MessageStatusChangeEvent input, long socketId, ObjectWriteProxy writeProxy) throws IOException {
 		try {
-			if (!(input.get() == MessageStatus.READ))// check that no invalid MessageStatuses are sent
-				throw new EnvoyException("Message" + input.getId() + "has an invalid status");
-
-			ConnectionManager			conMan	= ConnectionManager.getInstance();
-			PersistenceManager			perMan	= PersistenceManager.getPersistenceManager();
-			envoy.server.data.Message	msg		= perMan.getMessageById(input.getId());
-
-			msg.setStatus(input.get());
-			msg.setReadDate(input.getDate());
-
-			if (conMan.isOnline(msg.getRecipient().getId())) writeProxy.write(conMan.getSocketId(msg.getRecipient().getId()), input);
-
-			perMan.updateMessage(msg);
-
-		} catch (IOException | EnvoyException e) {
-			if (e.getClass() == IOException.class)
-				System.err.println("Recipient online. Failed to send MessageStatusChangedMessageStatusChangeEvent at message" + input.getId());
+			// any other status than read is not supposed to be sent to the server
+			if (!(input.get() == MessageStatus.READ)) throw new EnvoyException("Message" + input.getId() + "has an invalid status");
+		} catch (EnvoyException e) {
 			e.printStackTrace();
+			return;
 		}
+		ConnectionManager	conMan	= ConnectionManager.getInstance();
+		PersistenceManager	perMan	= PersistenceManager.getPersistenceManager();
+
+		envoy.server.data.Message msg = perMan.getMessageById(input.getId());
+		msg.setStatus(input.get());
+		msg.setReadDate(input.getDate());
+		perMan.updateMessage(msg);
+
+		if (conMan.isOnline(msg.getRecipient().getId())) writeProxy.write(conMan.getSocketId(msg.getRecipient().getId()), input);
 	}
 }