From 57115393825ba779904ec9f52c7a8f84da3ff3f5 Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Tue, 31 Mar 2020 12:01:23 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-29003=20=E9=94=99=E8=AF=AF=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/env/DesignerWorkspaceGenerator.java    | 4 ++--
 .../src/main/java/com/fr/start/DesignerSuperListener.java     | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java b/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java
index ccbd5170cc..288f6baa30 100644
--- a/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java
+++ b/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java
@@ -23,6 +23,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 /**
  * 根据配置生成运行环境
@@ -55,7 +56,7 @@ public class DesignerWorkspaceGenerator {
                 WorkspaceClient client = null;
                 try {
                      client = future.get(WAIT_FREQ, TimeUnit.SECONDS);
-                } catch (Exception e) {
+                } catch (TimeoutException e) {
                     FineLoggerFactory.getLogger().error(e.getMessage(), e);
                     RemoteHandler.handle(config);
                 }
@@ -92,7 +93,6 @@ public class DesignerWorkspaceGenerator {
                 } catch (Exception e) {
                     FineLoggerFactory.getLogger().error(e.getMessage(), e);
                 }
-            } else {
             }
         }
     }
diff --git a/designer-realize/src/main/java/com/fr/start/DesignerSuperListener.java b/designer-realize/src/main/java/com/fr/start/DesignerSuperListener.java
index ebf135d26d..f6fa3c9376 100644
--- a/designer-realize/src/main/java/com/fr/start/DesignerSuperListener.java
+++ b/designer-realize/src/main/java/com/fr/start/DesignerSuperListener.java
@@ -81,6 +81,9 @@ public class DesignerSuperListener {
                     if (ComparatorUtils.equals(ReportState.ACTIVE.getValue(), msg)) {
                         startFrameListener();
                     }
+                    if (ComparatorUtils.equals(DesignerProcessType.INSTANCE.obtain(), msg)) {
+                        frameReport();
+                    }
                 }
             }
         });
@@ -90,6 +93,7 @@ public class DesignerSuperListener {
         onceFuture = service.schedule(new Runnable() {
             @Override
             public void run() {
+                cancel = true;
                 ProcessEventPipe pipe = process.getPipe();
                 pipe.fire(FineProcessEngineEvent.READY);
                 if (StringUtils.isNotEmpty(pipe.info())) {