[commit] #1061 rpc zombie thread is really killed.

Author: magiclu550

JPLS/src/main/java/cn/jsmod2/DefaultServer.java

@@ -153,6 +153,10 @@ public void registerTemplates(List<RegisterTemplate> registers,Server server) {
     }
 
 
-
-
+    @Override
+    public void close() {
+        if(ServerStarter.getInstance().getWebServer()!=null)
+            ServerStarter.getInstance().getWebServer().shutdown();
+        super.close();
+    }
 }

JPLS/src/main/java/cn/jsmod2/RPCHandler.java

@@ -44,7 +44,7 @@ public class RPCHandler{
 
     /**
      * 可以用于开启服务端(即开启web,log监听器,数据包监听器,事件调度器和指令调度器)
-     * 并开启心跳监听
+     * 并开启心跳监听,如果心跳监听超过5s没有反应则为超时，将关闭服务器
      * @param sw 启动选项，以数字代替
      *           <code>
      *                     .replace("1","-w")
@@ -82,15 +82,6 @@ public String start(String sw){
                     Utils.printException(e);
                 }
             }).start();
-            new Thread(()->{
-               while (Server.getSender()!=null&&!Server.getSender().getServer().isConnected);
-               try{
-                   if(!Server.getSender().getServer().isConnected)ServerStarter.getInstance().getWebServer().shutdown();
-               }catch (Exception e){
-                   Utils.printException(e);
-               }
-
-            });
         }
 
         return "server has started";

JPLS/src/main/java/cn/jsmod2/ServerStarter.java

@@ -144,6 +144,10 @@ public static ServerStarter getInstance() {
         return instance;
     }
 
+    /**
+     * RPC Server的WebServer,当不开启rpc模式时，WebServer会为null
+     * @return WebServer实例,如果没有开启rpc模式,则会返回null
+     */
     public WebServer getWebServer() {
         return webServer;
     }