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

Give immediate feedback on unknown recipient

Browse Source
This commit is contained in:
Tobias Eidelpes 2020-11-16 10:32:25 +01:00
parent 85c9dfb42e
commit 909c4af4e9
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,6 @@ public class DMTPConnection implements Runnable {
out.println("ok"); out.println("ok");
} catch (UnknownRecipientException e) { } catch (UnknownRecipientException e) {
out.println(e.getMessage()); out.println(e.getMessage());
shutdown();
} }
} else if ("to".equals(userInput.split("\\s+")[0])) { } else if ("to".equals(userInput.split("\\s+")[0])) {
msg.setTo(new ArrayList<>()); msg.setTo(new ArrayList<>());
@ -68,12 +67,17 @@ public class DMTPConnection implements Runnable {
int count = 0; int count = 0;
try { try {
for (String emailAddress : emailAddresses) { for (String emailAddress : emailAddresses) {
msg.addTo(new Email(emailAddress)); Email add = new Email(emailAddress);
count++; if (!this.messageStorage.containsKey(add)) {
throw new UnknownRecipientException("error unknown recipient " + add.toString());
} else {
msg.addTo(add);
count++;
}
} }
out.println("ok " + count); out.println("ok " + count);
} catch (MalformedInputException mie) { } catch (MalformedInputException | UnknownRecipientException e) {
out.println(mie.getMessage()); out.println(e.getMessage());
} }
} else if ("from".equals(userInput.split("\\s+")[0])) { } else if ("from".equals(userInput.split("\\s+")[0])) {
try { try {