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

Change UnknownDomain exception name

Browse Source
This commit is contained in:
Tobias Eidelpes 2020-12-06 20:14:50 +01:00
parent 2d9b157b78
commit d6c78911aa
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/dslab/exception/UnknownDomain.java
View File

@ -1,7 +0,0 @@
package dslab.exception;
public class UnknownDomain extends Exception {
public UnknownDomain(String errorMessage) {
super(errorMessage);
}
}

7
src/main/java/dslab/exception/UnknownDomainException.java Normal file
View File

@ -0,0 +1,7 @@
package dslab.exception;
public class UnknownDomainException extends Exception {
public UnknownDomainException(String errorMessage) {
super(errorMessage);
}
}

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

@ -15,7 +15,7 @@ import dslab.ComponentFactory;
import dslab.Email; import dslab.Email;
import dslab.Message; import dslab.Message;
import dslab.exception.MalformedInputException; import dslab.exception.MalformedInputException;
import dslab.exception.UnknownDomain; import dslab.exception.UnknownDomainException;
import dslab.util.Config; import dslab.util.Config;
public class TransferServer implements ITransferServer, Runnable { public class TransferServer implements ITransferServer, Runnable {
@ -171,7 +171,7 @@ public class TransferServer implements ITransferServer, Runnable {
replayMessage(msg, port); replayMessage(msg, port);
sent.put(recipient.getDomain(), true); sent.put(recipient.getDomain(), true);
} }
} catch (UnknownDomain e) { } catch (UnknownDomainException e) {
sendErrorMail(msg, e.getMessage()); sendErrorMail(msg, e.getMessage());
} }
} }
@ -210,11 +210,11 @@ public class TransferServer implements ITransferServer, Runnable {
} }
} }
private int domainLookup(Email email) throws UnknownDomain { private int domainLookup(Email email) throws UnknownDomainException {
logger.info("Performing domain lookup for address " + email.toString()); logger.info("Performing domain lookup for address " + email.toString());
if (this.mailboxServers.containsKey(email.getDomain())) if (this.mailboxServers.containsKey(email.getDomain()))
return this.mailboxServers.get(email.getDomain()); return this.mailboxServers.get(email.getDomain());
throw new UnknownDomain("error domain not found: " + email.getDomain()); throw new UnknownDomainException("error domain not found: " + email.getDomain());
} }
private void sendErrorMail(Message msg, String error) { private void sendErrorMail(Message msg, String error) {
@ -223,7 +223,7 @@ public class TransferServer implements ITransferServer, Runnable {
int port; int port;
try { try {
port = domainLookup(errorMessage.getFrom()); port = domainLookup(errorMessage.getFrom());
} catch (UnknownDomain e) { } catch (UnknownDomainException e) {
logger.severe("Sending error mail failed because sender domain is unknown"); logger.severe("Sending error mail failed because sender domain is unknown");
return; return;
} }