Avoid self-deletion of ParallelResolver after a network change

1 files changed, 7 insertions, 34 deletions

diff --git a/src/net/java/sip/communicator/impl/dns/ParallelResolverImpl.java b/src/net/java/sip/communicator/impl/dns/ParallelResolverImpl.java
index ca93cce..0f5fcd6 100644
--- a/src/net/java/sip/communicator/impl/dns/ParallelResolverImpl.java
+++ b/src/net/java/sip/communicator/impl/dns/ParallelResolverImpl.java
@@ -92,20 +92,10 @@ public class ParallelResolverImpl
      */
     ParallelResolverImpl()
     {
-        try
-        {
-            defaultResolver = new ExtendedResolver();
-        }
-        catch (UnknownHostException e)
-        {
-            //should never happen
-            throw new RuntimeException("Failed to initialize resolver");
-        }
-
         DnsUtilActivator.getConfigurationService()
             .addPropertyChangeListener(this);
         initProperties();
-        Lookup.setDefaultResolver(this);
+        reset();
     }
 
     private void initProperties()
@@ -382,38 +372,21 @@ public class ParallelResolverImpl
      * Resets resolver configuration and populate our default resolver
      * with the newly configured servers.
      */
-    public void reset()
+    public final void reset()
     {
         Lookup.refreshDefault();
-        ExtendedResolver resolver = (ExtendedResolver)defaultResolver;
-
-        // remove old ones
-        for(Resolver r : resolver.getResolvers())
-        {
-            resolver.deleteResolver(r);
-        }
 
         // populate with new servers after refreshing configuration
         try
         {
-            String [] servers = ResolverConfig.getCurrentConfig().servers();
-            if (servers != null)
-            {
-                for (int i = 0; i < servers.length; i++)
-                {
-                    Resolver r = new SimpleResolver(servers[i]);
-                    //r.setTimeout(quantum);
-                    resolver.addResolver(r);
-                }
-            }
-            else
-            {
-                resolver.addResolver(new SimpleResolver());
-            }
+            Lookup.setDefaultResolver(this);
+            ExtendedResolver temp = new ExtendedResolver();
+            temp.setTimeout(10);
+            defaultResolver = temp;
         }
         catch (UnknownHostException e)
         {
-            //should never happen
+            // should never happen
             throw new RuntimeException("Failed to initialize resolver");
         }
     }