JAMES-2340 IsMarkedAsSpam should not rely on `toString` method
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/71a6a834 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/71a6a834 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/71a6a834 Branch: refs/heads/master Commit: 71a6a83485d9b198ace3bc65db28d93afd2baebb Parents: 8e2b819 Author: benwa <btell...@linagora.com> Authored: Mon Mar 12 15:01:39 2018 +0700 Committer: benwa <btell...@linagora.com> Committed: Mon Mar 12 15:01:39 2018 +0700 ---------------------------------------------------------------------- .../org/apache/james/transport/matchers/IsMarkedAsSpam.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/71a6a834/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsMarkedAsSpam.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsMarkedAsSpam.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsMarkedAsSpam.java index f3e6db4..252f53b 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsMarkedAsSpam.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsMarkedAsSpam.java @@ -65,7 +65,7 @@ public class IsMarkedAsSpam extends GenericMatcher { } @Override - public Collection<MailAddress> match(Mail mail) throws MessagingException { + public Collection<MailAddress> match(Mail mail) { Serializable attribute = mail.getAttribute(SpamAssassinResult.STATUS_MAIL_ATTRIBUTE_NAME); if (isMarkedAsSpam(attribute)) { return mail.getRecipients(); @@ -74,8 +74,8 @@ public class IsMarkedAsSpam extends GenericMatcher { } private boolean isMarkedAsSpam(Serializable attribute) { - return attribute != null && - attribute.toString() + return attribute instanceof String && + ((String) attribute) .toLowerCase(Locale.US) .startsWith(YES); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
