zenon/ds-assignment-1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug where recipients of the same domain receive message twice

Browse Source
This commit is contained in:
Tobias Eidelpes 2020-11-18 12:59:36 +01:00
parent 7604f4dee3
commit 72bdacf055
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/dslab/mailbox/DMTPConnection.java
View File

@ -128,9 +128,23 @@ public class DMTPConnection implements Runnable {
private synchronized void storeMessage() { private synchronized void storeMessage() {
logger.info("Storing message " + msg.toString()); logger.info("Storing message " + msg.toString());
this.msg.setId(MailboxServer.id++); this.msg.setId(MailboxServer.id++);
boolean alreadyPresent;
for (Email recipient : this.msg.getTo()) { for (Email recipient : this.msg.getTo()) {
alreadyPresent = false;
logger.info("storeMessage(): checking if msg " + msg.listMessage() + " already exists for recipient " + recipient.toString());
if (this.messageStorage.containsKey(recipient)) { if (this.messageStorage.containsKey(recipient)) {
this.messageStorage.get(recipient).add(this.msg); // Check if message already exists for user
for (Message m : this.messageStorage.get(recipient)) {
if (this.msg.getId().equals(m.getId())) {
logger.info("storeMessage(): msg " + msg.listMessage() + " already exists for recipient " + recipient.toString());
alreadyPresent = true;
break;
}
}
// Save only if message doesn't already exist
if (!alreadyPresent) {
this.messageStorage.get(recipient).add(this.msg);
}
} }
} }
this.msg = new Message(); this.msg = new Message();

8
src/main/java/dslab/transfer/TransferServer.java
View File

@ -157,6 +157,9 @@ public class TransferServer implements ITransferServer, Runnable {
logger.info("Queue not empty. Processing message..."); logger.info("Queue not empty. Processing message...");
Message msg = blockingQueue.take(); Message msg = blockingQueue.take();
logger.info("Took message " + msg.toString() + " from queue"); logger.info("Took message " + msg.toString() + " from queue");
HashMap<String, Boolean> sent = new HashMap<>();
sent.put("earth.planet", false);
sent.put("univer.ze", false);
for (Email recipient : msg.getTo()) { for (Email recipient : msg.getTo()) {
logger.info("msg.getTo() contains: " + msg.getTo().toString()); logger.info("msg.getTo() contains: " + msg.getTo().toString());
logger.info("Trying to send message to " + recipient.toString()); logger.info("Trying to send message to " + recipient.toString());
@ -164,7 +167,10 @@ public class TransferServer implements ITransferServer, Runnable {
try { try {
port = domainLookup(recipient); port = domainLookup(recipient);
logger.info("Domain lookup successful. Port is: " + port); logger.info("Domain lookup successful. Port is: " + port);
replayMessage(msg, port); if (!sent.get(recipient.getDomain())) {
replayMessage(msg, port);
sent.put(recipient.getDomain(), true);
}
} catch (UnknownDomain e) { } catch (UnknownDomain e) {
sendErrorMail(msg, e.getMessage()); sendErrorMail(msg, e.getMessage());
} }