From 5d0cc7e84cd88e9e49712b6c56f6271ab5fbdbd0 Mon Sep 17 00:00:00 2001
From: DieGurke <55625494+DieGurke@users.noreply.github.com>
Date: Sun, 28 Jun 2020 10:33:06 +0200
Subject: [PATCH] Fixed error regarding notSerializable exception

---
 src/main/java/envoy/server/data/GroupMessage.java          | 3 ++-
 .../envoy/server/processors/LoginCredentialProcessor.java  | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/envoy/server/data/GroupMessage.java b/src/main/java/envoy/server/data/GroupMessage.java
index 13c1d08..176c82e 100644
--- a/src/main/java/envoy/server/data/GroupMessage.java
+++ b/src/main/java/envoy/server/data/GroupMessage.java
@@ -1,6 +1,7 @@
 package envoy.server.data;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Map;
 
 import javax.persistence.Column;
@@ -73,7 +74,7 @@ public class GroupMessage extends Message {
 			.setForwarded(forwarded)
 			.setStatus(status)
 			.setText(text)
-			.buildGroupMessage((envoy.data.Group) recipient.toCommon(), memberMessageStatus);
+			.buildGroupMessage((envoy.data.Group) recipient.toCommon(), new HashMap<>(memberMessageStatus));
 		groupMessage.setReceivedDate(receivedDate);
 		groupMessage.setReadDate(readDate);
 		return groupMessage;
diff --git a/src/main/java/envoy/server/processors/LoginCredentialProcessor.java b/src/main/java/envoy/server/processors/LoginCredentialProcessor.java
index d0010a4..f0da20f 100755
--- a/src/main/java/envoy/server/processors/LoginCredentialProcessor.java
+++ b/src/main/java/envoy/server/processors/LoginCredentialProcessor.java
@@ -145,9 +145,10 @@ public final class LoginCredentialProcessor implements ObjectProcessor<LoginCred
 		for (GroupMessage gmsg : pendingGroupMessages) {
 			if (gmsg.getMemberMessageStatus().get(user.getID()) == MessageStatus.SENT) {
 				gmsg.getMemberMessageStatus().replace(user.getID(), MessageStatus.RECEIVED);
-				logger.info("Sending groupMessage" + gmsg.toCommon());
-				System.out.println(gmsg.toCommon().toString());
-				writeProxy.write(socketID, gmsg.toCommon());
+				envoy.data.GroupMessage groupMessage = gmsg.toCommon();
+				logger.info("Sending groupMessage" + groupMessage);
+				System.out.println(groupMessage.toString());
+				writeProxy.write(socketID, groupMessage);
 				// Sending memberStatusEvent to all members (event does not exist yet I think)
 				if (!gmsg.getMemberMessageStatus().containsValue(MessageStatus.SENT)) {
 					gmsg.setStatus(MessageStatus.RECEIVED);