JAMES-2251 Always perform the concatenation
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/62619e28 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/62619e28 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/62619e28 Branch: refs/heads/master Commit: 62619e28b2c45da024eb2b56192c889f7453dbb9 Parents: 7d2fee7 Author: Daniel Trebbien <[email protected]> Authored: Thu Dec 7 11:56:59 2017 -0600 Committer: Antoine Duprat <[email protected]> Committed: Tue Dec 12 09:47:38 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/james/domainlist/lib/AbstractDomainList.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/62619e28/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java index e786ab1..9184a6b 100644 --- a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java +++ b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java @@ -159,9 +159,9 @@ public abstract class AbstractDomainList implements DomainList, Configurable { // https://stackoverflow.com/questions/37919648/concatenating-immutablelists // A work-around is to use Iterables.concat() until something like // https://github.com/google/guava/issues/1029 is implemented. - Iterable<String> domainsWithoutIp = (detectedDomains.isEmpty() ? domains : Iterables.concat(domains, detectedDomains)); + Iterable<String> domainsWithoutIp = Iterables.concat(domains, detectedDomains); ImmutableList<String> detectedIps = detectIps(domainsWithoutIp); - ImmutableList<String> allDomains = ImmutableList.copyOf(detectedIps.isEmpty() ? domainsWithoutIp : Iterables.concat(domainsWithoutIp, detectedIps)); + ImmutableList<String> allDomains = ImmutableList.copyOf(Iterables.concat(domainsWithoutIp, detectedIps)); if (LOGGER.isDebugEnabled()) { for (String domain : allDomains) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
