Browse Source

Pull request #13215: REPORT-109834 F0052,起始页触发报错,starting拿到的是false

Merge in DESIGN/design from ~DESTINY.LIN/design:release/11.0 to release/11.0

* commit '96ac4e0456cf578dc2bbe4fc914ddd931823ce79':
  REPORT-109834 F0052,起始页触发报错,starting拿到的是false
release/11.0
parent
commit
459e2c75dc
  1. 5
      designer-base/src/main/java/com/fr/design/mainframe/messagecollect/StartErrorMessageCollector.java
  2. 2
      designer-base/src/main/java/com/fr/startup/ui/StartupPageWindow.java

5
designer-base/src/main/java/com/fr/design/mainframe/messagecollect/StartErrorMessageCollector.java

@ -52,7 +52,10 @@ public class StartErrorMessageCollector {
* 异步记录 * 异步记录
*/ */
public void asyncRecord(String id, String msg, String detail) { public void asyncRecord(String id, String msg, String detail) {
executorService.submit(() -> record(id, msg, detail)); executorService.submit(() -> {
record(id, msg, detail);
StartErrorMessageCollector.getInstance().setExtraJudgeStart(false);
});
} }
public void record(String id, String msg) { public void record(String id, String msg) {

2
designer-base/src/main/java/com/fr/startup/ui/StartupPageWindow.java

@ -258,6 +258,7 @@ public class StartupPageWindow extends JFrame {
try { try {
Void result = get(); Void result = get();
setVisible(false); setVisible(false);
StartErrorMessageCollector.getInstance().setExtraJudgeStart(false);
} catch (Exception e) { } catch (Exception e) {
// 处理错误 // 处理错误
UIUtil.invokeLaterIfNeeded(() -> { UIUtil.invokeLaterIfNeeded(() -> {
@ -279,7 +280,6 @@ public class StartupPageWindow extends JFrame {
e.getMessage()); e.getMessage());
} finally { } finally {
loadingPanel.hide(); loadingPanel.hide();
StartErrorMessageCollector.getInstance().setExtraJudgeStart(false);
} }
} }
}; };

Loading…
Cancel
Save