From 119b48d47dc975aa8cc152637f20b88719db0efc Mon Sep 17 00:00:00 2001
From: "Mata.Li" <Mata.Li@fanruan.com>
Date: Wed, 18 Jul 2018 16:02:03 +0800
Subject: [PATCH] REPORT-9619

---
 .../src/main/java/com/fr/start/module/DesignerStartup.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java b/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java
index b5155bd911..5f9ec707cb 100644
--- a/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java
+++ b/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java
@@ -32,9 +32,10 @@ public class DesignerStartup extends Activator {
         final String[] args = getModule().upFindSingleton(StartupArgs.class).get();
         final Designer designer = new Designer(args);
 
-        getRoot().setSingleton(EnvSwitcher.class, new EnvSwitcher());
+        EnvSwitcher switcher = new EnvSwitcher();
         //设置好环境即可，具体跟环境有关的模块会自动调用
-        getRoot().getSingleton(EnvSwitcher.class).switch2LastEnv();
+        switcher.switch2LastEnv();
+        getRoot().setSingleton(EnvSwitcher.class, switcher);
         //启动env
         startSub(EnvBasedModule.class);
         startSub(DesignerWorkspaceProvider.class);