svn commit: r601768 - in /james/jspf/trunk/src/test/java/org/apache/james/jspf: AbstractYamlTest.java dnsserver/DNSTestingServer.java

[bago]

Author: bago
Date: Thu Dec  6 07:58:30 2007
New Revision: 601768

URL: http://svn.apache.org/viewvc?rev=601768&view=rev
Log:
Make sure to clean up caches when the "faked zone" changes (JSPF-59)

Modified:
    james/jspf/trunk/src/test/java/org/apache/james/jspf/AbstractYamlTest.java
    
james/jspf/trunk/src/test/java/org/apache/james/jspf/dnsserver/DNSTestingServer.java

Modified: 
james/jspf/trunk/src/test/java/org/apache/james/jspf/AbstractYamlTest.java
URL: 
http://svn.apache.org/viewvc/james/jspf/trunk/src/test/java/org/apache/james/jspf/AbstractYamlTest.java?rev=601768&r1=601767&r2=601768&view=diff
==============================================================================
--- james/jspf/trunk/src/test/java/org/apache/james/jspf/AbstractYamlTest.java 
(original)
+++ james/jspf/trunk/src/test/java/org/apache/james/jspf/AbstractYamlTest.java 
Thu Dec  6 07:58:30 2007
@@ -45,9 +45,11 @@
 import org.jvyaml.Constructor;
 import org.jvyaml.DefaultYAMLFactory;
 import org.jvyaml.YAMLFactory;
+import org.xbill.DNS.Cache;
 import org.xbill.DNS.DClass;
 import org.xbill.DNS.ExtendedNonblockingResolver;
 import org.xbill.DNS.Lookup;
+import org.xbill.DNS.LookupAsynch;
 import org.xbill.DNS.Name;
 import org.xbill.DNS.NonblockingResolver;
 import org.xbill.DNS.Resolver;
@@ -208,6 +210,11 @@
             executor = new StagedMultipleSPFExecutor(log, new 
DNSServiceAsynchSimulator(dns, getSpfExecutorType() == 
STAGED_EXECUTOR_MULTITHREADED));
         } else if (getSpfExecutorType() == STAGED_EXECUTOR_DNSJNIO) {
             
+            // reset cache between usages of the asynchronous lookuper
+            LookupAsynch.setDefaultCache(new Cache(), DClass.IN);
+            // reset cache between usages of the asynchronous lookuper
+            LookupAsynch.getDefaultCache(DClass.IN).clearCache();
+
             try {
                 ExtendedNonblockingResolver resolver;
                 

Modified: 
james/jspf/trunk/src/test/java/org/apache/james/jspf/dnsserver/DNSTestingServer.java
URL: 
http://svn.apache.org/viewvc/james/jspf/trunk/src/test/java/org/apache/james/jspf/dnsserver/DNSTestingServer.java?rev=601768&r1=601767&r2=601768&view=diff
==============================================================================
--- 
james/jspf/trunk/src/test/java/org/apache/james/jspf/dnsserver/DNSTestingServer.java
 (original)
+++ 
james/jspf/trunk/src/test/java/org/apache/james/jspf/dnsserver/DNSTestingServer.java
 Thu Dec  6 07:58:30 2007
@@ -127,7 +127,7 @@
         zone = null;
     }
 
-    public void setData(HashMap zonedata) {
+    public synchronized void setData(HashMap zonedata) {
         try {
             this.timeoutServers = new HashSet();
             List records = new LinkedList();



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]