Do not shutdown connection manager on restart

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1020 3d1905a2-6b24-0410-a738-b14d5a86fcbd

src/java/davmail/DavGateway.java

@@ -168,20 +168,34 @@ public final class DavGateway {
      * Stop all listeners, shutdown connection pool and clear session cache.
      */
     public static void stop() {
-        for (AbstractServer server : SERVER_LIST) {
+        DavGateway.stopServers();
-            server.close();
-            try {
-                server.join();
-            } catch (InterruptedException e) {
-                DavGatewayTray.warn(new BundleMessage("LOG_EXCEPTION_WAITING_SERVER_THREAD_DIE"), e);
-            }
-        }
         // close pooled connections
         DavGatewayHttpClientFacade.stop();
         // clear session cache
         ExchangeSessionFactory.reset();
     }
 
+    /**
+     * Stop all listeners and clear session cache.
+     */
+    public static void restart() {
+        DavGateway.stopServers();
+        // clear session cache
+        ExchangeSessionFactory.reset();
+        DavGateway.start();
+    }
+
+    private static void stopServers() {
+        for (AbstractServer server : SERVER_LIST) {
+           server.close();
+           try {
+               server.join();
+           } catch (InterruptedException e) {
+               DavGatewayTray.warn(new BundleMessage("LOG_EXCEPTION_WAITING_SERVER_THREAD_DIE"), e);
+           }
+       }
+    }
+
     /**
      * Get current DavMail version.
      *

src/java/davmail/ui/SettingsFrame.java

@@ -611,8 +611,7 @@ public class SettingsFrame extends JFrame {
                 dispose();
                 Settings.save();
                 // restart listeners with new config
-                DavGateway.stop();
+                DavGateway.restart();
-                DavGateway.start();
             }
         };
         ok.addActionListener(save);