From 20a39e41ed7d2fad167ce6a6e0d8993d42ea57fd Mon Sep 17 00:00:00 2001
From: zack <zack@finereport.com>
Date: Mon, 3 Dec 2018 20:17:54 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-13215=2010.0=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E8=BF=87=E7=A8=8B=E4=B8=AD=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E7=94=B1=E4=BA=8E=E6=8A=A5=E9=94=99=E5=AF=BC=E8=87=B4=E7=99=BD?=
 =?UTF-8?q?=E8=89=B2=E8=92=99=E5=B1=82=E4=B8=8D=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/start/BaseDesigner.java    |  2 ++
 .../src/main/java/com/fr/start/ServerStarter.java   | 13 +++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/start/BaseDesigner.java b/designer-base/src/main/java/com/fr/start/BaseDesigner.java
index 3e466ed1f..b1931f284 100644
--- a/designer-base/src/main/java/com/fr/start/BaseDesigner.java
+++ b/designer-base/src/main/java/com/fr/start/BaseDesigner.java
@@ -64,6 +64,8 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
             TemplateTreePane.getInstance().getTemplateFileTree().refresh();
         }
         DesignerContext.getDesignerFrame().updateProgress(PERCENT_COMPLETE);
+        throw new NullPointerException();
+
     }
 
 
diff --git a/designer-base/src/main/java/com/fr/start/ServerStarter.java b/designer-base/src/main/java/com/fr/start/ServerStarter.java
index 3115730d1..6d20cf12a 100644
--- a/designer-base/src/main/java/com/fr/start/ServerStarter.java
+++ b/designer-base/src/main/java/com/fr/start/ServerStarter.java
@@ -5,18 +5,11 @@ import com.fr.design.DesignerEnvManager;
 import com.fr.design.utils.BrowseUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
-import com.fr.log.FineLoggerFactory;
-import com.fr.stable.OperatingSystem;
 import com.fr.stable.StableUtils;
 import com.fr.start.server.FineEmbedServer;
 import com.fr.start.server.FineEmbedServerMonitor;
 import com.fr.workspace.WorkContext;
 
-import javax.swing.JOptionPane;
-import java.awt.Desktop;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -66,7 +59,11 @@ public class ServerStarter {
 
                 @Override
                 public void run() {
-                    FineEmbedServer.start();
+                    try {
+                        FineEmbedServer.start();
+                    } finally {
+                        FineEmbedServerMonitor.getInstance().setComplete();
+                    }
                     BrowseUtils.browser(url);
                 }
             });