From 525837842ca9a5419289eeb9be00a9f3dd8119c7 Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Wed, 2 Jan 2019 19:03:53 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-14020=20=E5=8F=AF=E4=BB=A5=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E6=89=93=E5=BC=80=E8=AE=BE=E8=AE=A1=E5=99=A8=20?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E7=9A=84=E4=BB=A3=E7=A0=81=E4=B8=8A=E6=AC=A1?=
 =?UTF-8?q?=E8=AF=AF=E4=BC=A0=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fr/design/utils/DesignUtils.java   | 12 ++++++------
 .../fr/start/server/FineEmbedServerActivator.java    |  1 +
 .../main/java/com/fr/start/fx/PrismImageLoader2.java | 11 ++++++++++-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java
index 77173cebb..240176eef 100644
--- a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java
+++ b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java
@@ -65,12 +65,12 @@ public class DesignUtils {
      * @return 启动了返回true
      */
     public static boolean isStarted() {
-//        try {
-//            new Socket("localhost", port);
-//            return true;
-//        } catch (Exception exp) {
-//
-//        }
+        try {
+            new Socket("localhost", port);
+            return true;
+        } catch (Exception exp) {
+
+        }
         return false;
     }
 
diff --git a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java
index 2d08b286d..eda1fb77e 100644
--- a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java
+++ b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java
@@ -68,6 +68,7 @@ public class FineEmbedServerActivator extends Activator {
         //覆盖tomcat的WebAppClassLoader
         context.setLoader(new FRTomcatLoader());
 
+
         //直接指定initializer，tomcat就不用再扫描一遍了
         SpringServletContainerInitializer initializer = new SpringServletContainerInitializer();
         Set<Class<?>> classes = new HashSet<Class<?>>();
diff --git a/designer-realize/src/main/java/com/fr/start/fx/PrismImageLoader2.java b/designer-realize/src/main/java/com/fr/start/fx/PrismImageLoader2.java
index 99066e964..c742a3851 100644
--- a/designer-realize/src/main/java/com/fr/start/fx/PrismImageLoader2.java
+++ b/designer-realize/src/main/java/com/fr/start/fx/PrismImageLoader2.java
@@ -67,11 +67,21 @@ class PrismImageLoader2 implements com.sun.javafx.tk.ImageLoader {
         return height;
     }
 
+    @Override
+    public boolean getError() {
+        return false;
+    }
+
     @Override
     public int getFrameCount() {
         return gifCount;
     }
 
+    @Override
+    public PlatformImage[] getFrames() {
+        return new PlatformImage[0];
+    }
+
     @Override
     public PlatformImage getFrame(int index) {
         while (images[index] == null) {
@@ -112,7 +122,6 @@ class PrismImageLoader2 implements com.sun.javafx.tk.ImageLoader {
         return 0;
     }
 
-    @Override
     public Exception getException() {
         return exception;
     }