Browse Source

DEC-8 设计器远程干涉服务器缓存问题

master
zack 7 years ago
parent
commit
0f52b449e8
  1. 5
      designer/src/com/fr/start/Designer.java
  2. 6
      designer_base/src/com/fr/env/RemoteEnv.java

5
designer/src/com/fr/start/Designer.java

@ -1,6 +1,7 @@
package com.fr.start; package com.fr.start;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.base.Env;
import com.fr.base.FRContext; import com.fr.base.FRContext;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;
import com.fr.design.actions.core.ActionFactory; import com.fr.design.actions.core.ActionFactory;
@ -30,6 +31,7 @@ import com.fr.design.menu.ShortCut;
import com.fr.design.module.DesignModuleFactory; import com.fr.design.module.DesignModuleFactory;
import com.fr.design.module.DesignerModule; import com.fr.design.module.DesignerModule;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.env.RemoteEnv;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.stable.ProductConstants; import com.fr.stable.ProductConstants;
@ -432,7 +434,10 @@ public class Designer extends BaseDesigner {
InformationCollector collector = InformationCollector.getInstance(); InformationCollector collector = InformationCollector.getInstance();
collector.collectStopTime(); collector.collectStopTime();
collector.saveXMLFile(); collector.saveXMLFile();
Env currentEnv = FRContext.getCurrentEnv();
if (!(currentEnv instanceof RemoteEnv)) {//远程环境不需要触发stop
ServletContext.fireServletStopListener(); ServletContext.fireServletStopListener();
} }
}
} }

6
designer_base/src/com/fr/env/RemoteEnv.java vendored

@ -574,6 +574,7 @@ public class RemoteEnv extends AbstractEnv {
clock.stop(); clock.stop();
// richer:把轮训使用的定时器也去掉 // richer:把轮训使用的定时器也去掉
timer.cancel(); timer.cancel();
HashMap<String, String> para = new HashMap<String, String>(); HashMap<String, String> para = new HashMap<String, String>();
para.put("op", "fr_remote_design"); para.put("op", "fr_remote_design");
para.put("cmd", "r_sign_out"); para.put("cmd", "r_sign_out");
@ -2281,9 +2282,4 @@ public class RemoteEnv extends AbstractEnv {
return StringUtils.EMPTY; return StringUtils.EMPTY;
} }
} }
@Override
public boolean isRemoteEnv() {
return true;
}
} }
Loading…
Cancel
Save