zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Fixed error regarding notSerializable exception

Browse Source
This commit is contained in:
DieGurke
2020-06-28 10:33:06 +02:00
parent cea599ac2f
commit acf58941ac
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/envoy/server/data/GroupMessage.java
View File

@@ -1,6 +1,7 @@
package envoy.server.data; package envoy.server.data;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.persistence.Column; import javax.persistence.Column;
@@ -73,7 +74,7 @@ public class GroupMessage extends Message {
.setForwarded(forwarded) .setForwarded(forwarded)
.setStatus(status) .setStatus(status)
.setText(text) .setText(text)
.buildGroupMessage((envoy.data.Group) recipient.toCommon(), memberMessageStatus); .buildGroupMessage((envoy.data.Group) recipient.toCommon(), new HashMap<>(memberMessageStatus));
groupMessage.setReceivedDate(receivedDate); groupMessage.setReceivedDate(receivedDate);
groupMessage.setReadDate(readDate); groupMessage.setReadDate(readDate);
return groupMessage; return groupMessage;

7
src/main/java/envoy/server/processors/LoginCredentialProcessor.java
View File

@@ -145,9 +145,10 @@ public final class LoginCredentialProcessor implements ObjectProcessor<LoginCred
for (GroupMessage gmsg : pendingGroupMessages) { for (GroupMessage gmsg : pendingGroupMessages) {
if (gmsg.getMemberMessageStatus().get(user.getID()) == MessageStatus.SENT) { if (gmsg.getMemberMessageStatus().get(user.getID()) == MessageStatus.SENT) {
gmsg.getMemberMessageStatus().replace(user.getID(), MessageStatus.RECEIVED); gmsg.getMemberMessageStatus().replace(user.getID(), MessageStatus.RECEIVED);
logger.info("Sending groupMessage" + gmsg.toCommon()); envoy.data.GroupMessage groupMessage = gmsg.toCommon();
System.out.println(gmsg.toCommon().toString()); logger.info("Sending groupMessage" + groupMessage);
writeProxy.write(socketID, gmsg.toCommon()); System.out.println(groupMessage.toString());
writeProxy.write(socketID, groupMessage);
// Sending memberStatusEvent to all members (event does not exist yet I think) // Sending memberStatusEvent to all members (event does not exist yet I think)
if (!gmsg.getMemberMessageStatus().containsValue(MessageStatus.SENT)) { if (!gmsg.getMemberMessageStatus().containsValue(MessageStatus.SENT)) {
gmsg.setStatus(MessageStatus.RECEIVED); gmsg.setStatus(MessageStatus.RECEIVED);