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

Fixed invalid MessageStatusChangeEvent sending

Browse Source 
The sender got a messageStatusChangeEvent even if the status was still
sent from the server and couldn't process it.
The server does not send this unnecessary event even more
This commit is contained in:
DieGurke
2020-06-10 23:01:10 +02:00
committed by kske
parent 72da2d46ca
commit 4bf1fbbc59
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/envoy/server/processors/MessageProcessor.java
View File

@@ -6,6 +6,7 @@ import java.util.Date;
import javax.persistence.EntityExistsException; import javax.persistence.EntityExistsException;
import envoy.data.Message; import envoy.data.Message;
import envoy.data.Message.MessageStatus;
import envoy.event.MessageStatusChangeEvent; import envoy.event.MessageStatusChangeEvent;
import envoy.server.data.PersistenceManager; import envoy.server.data.PersistenceManager;
import envoy.server.net.ConnectionManager; import envoy.server.net.ConnectionManager;
@@ -30,6 +31,7 @@ public class MessageProcessor implements ObjectProcessor<Message> {
ConnectionManager connectionManager = ConnectionManager.getInstance(); ConnectionManager connectionManager = ConnectionManager.getInstance();
sendToUser(connectionManager, message, writeProxy); sendToUser(connectionManager, message, writeProxy);
if (message.getStatus() != MessageStatus.SENT) {
// Sending a messageStatusChangeEvent to the sender // Sending a messageStatusChangeEvent to the sender
try { try {
writeProxy.write(socketID, new MessageStatusChangeEvent(message)); writeProxy.write(socketID, new MessageStatusChangeEvent(message));
@@ -37,6 +39,7 @@ public class MessageProcessor implements ObjectProcessor<Message> {
System.err.println("Could not send messageStatusChangeEvent to the sender of this message with ID: " + message.getID()); System.err.println("Could not send messageStatusChangeEvent to the sender of this message with ID: " + message.getID());
e.printStackTrace(); e.printStackTrace();
} }
}
try { try {
PersistenceManager.getInstance().addMessage(new envoy.server.data.Message(message)); PersistenceManager.getInstance().addMessage(new envoy.server.data.Message(message));
} catch (EntityExistsException e) { } catch (EntityExistsException e) {