X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fmail%2FAddress.java;h=100cf53a3c45cd0fb03c4948998409fbd592b941;hb=4b76a31e8f86bc8de673899bbb45252c01e9a0f6;hp=b54dcfa1ddd9819f7f20eca6549de703ee452155;hpb=483c122ecab4402720e9f9d3b18ddb3c87a2b34a;p=org.ibex.mail.git

diff --git a/src/org/ibex/mail/Address.java b/src/org/ibex/mail/Address.java
index b54dcfa..100cf53 100644
--- a/src/org/ibex/mail/Address.java
+++ b/src/org/ibex/mail/Address.java
@@ -54,13 +54,20 @@ public class Address extends JSReflection implements Serializable {
         return desc && description != null && description.length() > 0 ? (description+" <" + toString() + ">") : toString(); }
     public static class Malformed extends Message.Malformed { public Malformed(String s) { super(s); } }
 
+    /** in case of flaky DNS */
+    private static HashSet<String> local = new HashSet<String>();
     public boolean isLocal() {
-        InetAddress[] mx = SMTP.getMailExchangerIPs(host);
-        for(int i=0; i<mx.length; i++) {
-            try { if (NetworkInterface.getByInetAddress(mx[i]) != null) { return true; } }
-            catch (Exception e) { /* DELIBERATE */ }
+        synchronized(local) {
+            if (local.contains(host)) return true;
+            InetAddress[] mx = DNSUtil.getMailExchangerIPs(host);
+            for(int i=0; i<mx.length; i++) {
+                try { if (NetworkInterface.getByInetAddress(mx[i]) != null) {
+                    local.add(host);
+                    return true;
+                } } catch (Exception e) { /* DELIBERATE */ }
+            }
         }
-        Log.warn(this, "returning false");
+        Log.warn(this, "returning false for " + this + ".isLocal()");
         return false;
     }