Merge pull request #476 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0

* commit '3121c8d87a30b4e7bf601ada27451d0d2c007329':
  REPORT-11257

designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java

@@ -15,6 +15,7 @@ import com.fr.design.menu.SeparatorDef;
 import com.fr.design.utils.DesignUtils;
 import com.fr.license.exception.RegistEditionException;
 import com.fr.log.FineLoggerFactory;
+import com.fr.start.server.ServerTray;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.WorkContextCallback;
 import com.fr.workspace.Workspace;
@@ -110,6 +111,10 @@ public class SwitchExistEnv extends MenuDef {
                         DesignUtils.refreshDesignerFrame();
                         HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().refreshToolArea();
                         fireDSChanged();
+                        if (WorkContext.getCurrent().isLocal()) {
+                            //初始化一下serverTray
+                            ServerTray.init();
+                        }
                     }
                 });
             } catch (AuthException exception) {

designer-base/src/main/java/com/fr/start/server/ServerTray.java

@@ -173,8 +173,7 @@ public class ServerTray {
     }
 
     public static void init() {
-        
+        if (INSTANCE == null)
             INSTANCE = new ServerTray();
-        
     }
 }