1 files changed, 6 insertions, 46 deletions

diff --git a/java/src/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/Coordinator.java
index 17d1c4876a2..aae3b713e02 100644
--- a/java/src/IceGridGUI/Coordinator.java
+++ b/java/src/IceGridGUI/Coordinator.java
@@ -641,25 +641,6 @@ public class Coordinator
         return _communicator;
     }
 
-    public Ice.Communicator getWizardCommunicator()
-    {
-        if(_wizardCommunicator == null)
-        {
-            //
-            // Create a communicator that is used by connection wizards to
-            // parse endpoints.
-            //
-            // We enable IceSSL so the communicator knows how to parse ssl
-            // endpoints.
-            //
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = Ice.Util.createProperties();
-            initData.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL.PluginFactory");
-            _wizardCommunicator = Ice.Util.initialize(initData);
-        }
-        return _wizardCommunicator;
-    }
-
     public Ice.Properties getProperties()
     {
         return _initData.properties;
@@ -1281,7 +1262,7 @@ public class Coordinator
         //
         _transientCert = null;
         _liveDeploymentRoot.clear();
-
+        
         destroyCommunicator();
 
         Ice.InitializationData initData = _initData;
@@ -2624,6 +2605,11 @@ public class Coordinator
 
         _initData.logger = new Logger(mainFrame);
         _initData.properties = createProperties(args);
+        //
+        // We enable IceSSL so the communicator knows how to parse ssl
+        // endpoints.
+        //
+        _initData.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL.PluginFactory");
 
         if(args.value.length > 0)
         {
@@ -2649,7 +2635,6 @@ public class Coordinator
                 {
                     destroyIceGridAdmin();
                     destroyCommunicator();
-                    destroyWizardCommunicator();
                 }
             };
 
@@ -3470,7 +3455,6 @@ public class Coordinator
 
         destroyIceGridAdmin();
         destroyCommunicator();
-        destroyWizardCommunicator();
 
         _executor.shutdown();
         _executor = null;
@@ -3493,34 +3477,11 @@ public class Coordinator
             }
             catch(Ice.LocalException e)
             {
-                System.err.println("_communicator.destroy() raised " + e.toString());
-                e.printStackTrace();
             }
             _communicator = null;
         }
     }
 
-    //
-    // Can be called by the shutdown hook thread
-    //
-    private void destroyWizardCommunicator()
-    {
-        if(_wizardCommunicator != null)
-        {
-            try
-            {
-                _wizardCommunicator.destroy();
-            }
-            catch(Ice.LocalException e)
-            {
-                System.err.println("_wizardCommunicator.destroy() raised "
-                                   + e.toString());
-                e.printStackTrace();
-            }
-            _wizardCommunicator = null;
-        }
-    }
-
     private boolean loadWindowPrefs()
     {
         try
@@ -3957,7 +3918,6 @@ public class Coordinator
     private boolean _substitute = false;
 
     private JFrame _mainFrame;
-    private Ice.Communicator _wizardCommunicator;
     private final SessionKeeper _sessionKeeper;
 
     private Object _clipboard;