Author: bago
Date: Mon Aug 8 11:16:20 2005
New Revision: 230835
URL: http://svn.apache.org/viewcvs?rev=230835&view=rev
Log:
Reverted a small code patch about single ip per mx committed by mistake (it was
from another issue)
Modified:
james/server/trunk/src/java/org/apache/james/dnsserver/DNSServer.java
Modified: james/server/trunk/src/java/org/apache/james/dnsserver/DNSServer.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/dnsserver/DNSServer.java?rev=230835&r1=230834&r2=230835&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/dnsserver/DNSServer.java
(original)
+++ james/server/trunk/src/java/org/apache/james/dnsserver/DNSServer.java Mon
Aug 8 11:16:20 2005
@@ -81,12 +81,6 @@
private Comparator mxComparator = new MXRecordComparator();
/**
- * If true than the DNS server will return only a single IP per each MX
record
- * when looking up SMTPServers
- */
- private boolean singleIPPerMX;
-
- /**
* @see
org.apache.avalon.framework.configuration.Configurable#configure(Configuration)
*/
public void configure( final Configuration configuration )
@@ -95,8 +89,6 @@
final boolean autodiscover =
configuration.getChild( "autodiscover" ).getValueAsBoolean( true );
- singleIPPerMX = configuration.getChild( "singleIPperMX"
).getValueAsBoolean( false );
-
if (autodiscover) {
getLogger().info("Autodiscovery is enabled - trying to discover
your system's DNS Servers");
String[] serversArray =
ResolverConfig.getCurrentConfig().servers();
@@ -176,7 +168,7 @@
public String[] getDNSServers() {
return (String[])dnsServers.toArray(new String[0]);
}
-
+
/**
* <p>Return a prioritized unmodifiable list of MX records
* obtained from the server.</p>
@@ -311,7 +303,7 @@
return rawDNSLookup(namestr, true, type);
}
}
-
+
private Record[] processSetResponse(SetResponse sr) {
Record [] answers;
int answerCount = 0, n = 0;
@@ -394,11 +386,7 @@
final String nextHostname = (String)mxHosts.next();
InetAddress[] addrs = null;
try {
- if (singleIPPerMX) {
- addrs = new InetAddress[]
{getByName(nextHostname)};
- } else {
- addrs = getAllByName(nextHostname);
- }
+ addrs = getAllByName(nextHostname);
} catch (UnknownHostException uhe) {
// this should never happen, since we just got
// this host from mxHosts, which should have
@@ -493,5 +481,5 @@
*/
public void dispose()
{
- }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
