You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/01/17 11:01:46 UTC
[7/8] james-project git commit: MAILBOX-372 SpamAssassinListener
should not catch exceptions
MAILBOX-372 SpamAssassinListener should not catch exceptions
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a5870f5e
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a5870f5e
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a5870f5e
Branch: refs/heads/master
Commit: a5870f5ecb0c66ae2ab2b73325cd2a13f942b38f
Parents: 45691e9
Author: Benoit Tellier <bt...@linagora.com>
Authored: Wed Jan 16 11:53:16 2019 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Thu Jan 17 18:01:13 2019 +0700
----------------------------------------------------------------------
.../spamassassin/SpamAssassinListener.java | 18 +++++++-----------
.../spamassassin/SpamAssassinListenerTest.java | 4 ++--
2 files changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/a5870f5e/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java b/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java
index 5427320..70ce446 100644
--- a/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java
+++ b/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java
@@ -82,17 +82,13 @@ public class SpamAssassinListener implements SpamEventListener {
}
@Override
- public void event(Event event) {
- try {
- MailboxSession session = mailboxManager.createSystemSession(getClass().getCanonicalName());
- if (event instanceof MessageMoveEvent) {
- handleMessageMove(event, session, (MessageMoveEvent) event);
- }
- if (event instanceof Added) {
- handleAdded(event, session, (Added) event);
- }
- } catch (MailboxException e) {
- LOGGER.warn("Error while processing SPAM listener", e);
+ public void event(Event event) throws MailboxException {
+ MailboxSession session = mailboxManager.createSystemSession(getClass().getCanonicalName());
+ if (event instanceof MessageMoveEvent) {
+ handleMessageMove(event, session, (MessageMoveEvent) event);
+ }
+ if (event instanceof Added) {
+ handleAdded(event, session, (Added) event);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a5870f5e/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java b/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java
index e1647ae..1a66b30 100644
--- a/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java
+++ b/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java
@@ -141,7 +141,7 @@ public class SpamAssassinListenerTest {
}
@Test
- public void eventShouldCallSpamAssassinSpamLearningWhenTheEventMatches() {
+ public void eventShouldCallSpamAssassinSpamLearningWhenTheEventMatches() throws Exception {
MessageMoveEvent messageMoveEvent = MessageMoveEvent.builder()
.session(MAILBOX_SESSION)
.messageMoves(MessageMoves.builder()
@@ -213,7 +213,7 @@ public class SpamAssassinListenerTest {
}
@Test
- public void eventShouldCallSpamAssassinHamLearningWhenTheEventMatches() {
+ public void eventShouldCallSpamAssassinHamLearningWhenTheEventMatches() throws Exception {
MessageMoveEvent messageMoveEvent = MessageMoveEvent.builder()
.session(MAILBOX_SESSION)
.messageMoves(MessageMoves.builder()
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org