Fixes some reconnect issues and early events where still no dns is configured (now waiting half a second). Fixes jabber provider not cleaned up after connection failed (during login process). Fixes an needed reconnect when more than one interface available and network is going down (stand by).

1 files changed, 19 insertions, 1 deletions

diff --git a/src/net/java/sip/communicator/plugin/reconnectplugin/ReconnectPluginActivator.java b/src/net/java/sip/communicator/plugin/reconnectplugin/ReconnectPluginActivator.java
index 2602439..f8d9525 100644
--- a/src/net/java/sip/communicator/plugin/reconnectplugin/ReconnectPluginActivator.java
+++ b/src/net/java/sip/communicator/plugin/reconnectplugin/ReconnectPluginActivator.java
@@ -113,7 +113,7 @@ public class ReconnectPluginActivator
     /**
      * Start of the delay interval when starting a reconnect.
      */
-    private static final int RECONNECT_DELAY_MIN = 1; // sec
+    private static final int RECONNECT_DELAY_MIN = 2; // sec
 
     /**
      * The end of the interval for the initial reconnect.
@@ -784,6 +784,24 @@ public class ReconnectPluginActivator
                              if(timer == null)
                                  return;
 
+                             if(connectedInterfaces.size() == 0)
+                             {
+                                 // well there is no network we just need
+                                 // this provider in needs reconnection when
+                                 // there is one
+                                 // means we started unregistering while
+                                 // network was going down and meanwhile there
+                                 // were no connected interface, this happens
+                                 // when we have more than one connected
+                                 // interface and we got 2 events for down iface
+                                 needsReconnection.add(pp);
+
+                                 if(currentlyReconnecting.containsKey(pp))
+                                    currentlyReconnecting.remove(pp).cancel();
+
+                                 return;
+                             }
+
                              currentlyReconnecting.put(pp, task);
 
                              if (logger.isTraceEnabled())