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 rc...@apache.org on 2020/02/25 03:48:49 UTC
[james-project] 04/04: [Refactoring] remove a condition that is
always true
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 3f6c85a0414fde1c234e0a3f0ee776d02fbb6649
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Fri Feb 21 17:42:41 2020 +0100
[Refactoring] remove a condition that is always true
---
.../mailetcontainer/lib/AbstractStateMailetProcessor.java | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
index adbea53..45db8ad 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
@@ -303,14 +303,8 @@ public abstract class AbstractStateMailetProcessor implements MailProcessor, Con
matcher = matcherLoader.getMatcher(createMatcherConfig(matcherName));
}
} else if (invertedMatcherName != null) {
- // try to load from compositeMatchers first
- // matcherName is a known null value at this state
- matcher = compositeMatchers.get(matcherName);
- if (matcher == null) {
- // no composite Matcher found, try to load it via
- // MatcherLoader
- matcher = matcherLoader.getMatcher(createMatcherConfig(invertedMatcherName));
- }
+ // no composite Matcher found, try to load it via MatcherLoader
+ matcher = matcherLoader.getMatcher(createMatcherConfig(invertedMatcherName));
matcher = new MatcherInverter(matcher);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org