Author: matthieu
Date: Mon Nov 2 14:54:25 2015
New Revision: 1712030
URL: http://svn.apache.org/viewvc?rev=1712030&view=rev
Log:
JAMES-1587 XML contains domain list operation should not be case sensitive
Contributed by Benoit Tellier
Modified:
james/project/trunk/server/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java
Modified:
james/project/trunk/server/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java?rev=1712030&r1=1712029&r2=1712030&view=diff
==============================================================================
---
james/project/trunk/server/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java
(original)
+++
james/project/trunk/server/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java
Mon Nov 2 14:54:25 2015
@@ -36,20 +36,16 @@ public class XMLDomainList extends Abstr
private final List<String> domainNames = new ArrayList<String>();
- private boolean managementDisabled = false;
-
@Override
public void configure(HierarchicalConfiguration config) throws
ConfigurationException {
super.configure(config);
for (String serverNameConf :
config.getStringArray("domainnames.domainname")) {
try {
- addDomain(serverNameConf);
+ addToServedDomains(serverNameConf);
} catch (DomainListException e) {
throw new ConfigurationException("Unable to add domain to
memory", e);
}
}
-
- managementDisabled = true;
}
@Override
@@ -59,29 +55,23 @@ public class XMLDomainList extends Abstr
@Override
public boolean containsDomain(String domains) throws DomainListException {
- return domainNames.contains(domains);
+ return domainNames.contains(domains.toLowerCase(Locale.US));
}
@Override
public void addDomain(String domain) throws DomainListException {
- // TODO: Remove later. Temporary fix to get sure no domains can be
added
- // to the XMLDomainList
- if (managementDisabled)
- throw new DomainListException("Read-Only DomainList
implementation");
-
- String newDomain = domain.toLowerCase(Locale.US);
- if (!containsDomain(newDomain)) {
- domainNames.add(newDomain);
- }
+ throw new DomainListException("Read-Only DomainList implementation");
}
@Override
public void removeDomain(String domain) throws DomainListException {
- // TODO: Remove later. Temporary fix to get sure no domains can be
added
- // to the XMLDomainList
- if (managementDisabled)
- throw new DomainListException("Read-Only DomainList
implementation");
+ throw new DomainListException("Read-Only DomainList implementation");
+ }
- domainNames.remove(domain.toLowerCase(Locale.US));
+ private void addToServedDomains(String domain) throws DomainListException {
+ String newDomain = domain.toLowerCase(Locale.US);
+ if (!containsDomain(newDomain)) {
+ domainNames.add(newDomain);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
