[commit] #1071 fix stop with npe

Author: magiclu550

JPLS/src/main/java/cn/jsmod2/core/protocol/BinaryStream.java

@@ -115,6 +115,9 @@ protected byte[] dataJsonEncode(String message) throws Exception{
     public <T> List<T> dataListDecode(byte[] data, Class<T> clz){
         try {
             String json = getDefaultJson(data);
+            if(json == null){
+                return null;
+            }
             String[] props = splitJson(json);
             json = props[0];
             List<T> list = JSON.parseArray(json,clz);
@@ -128,6 +131,9 @@ private String getDefaultJson(byte[] data) throws Exception{
         byte[] packetBytes = Base64.decodeBase64(data);
         packetBytes = Arrays.copyOf(packetBytes, Utils.getLen(packetBytes));
         String json = new String(packetBytes,properties.getProperty("decode"));
+        if(json.equals("null")){
+            return null;
+        }
         json = json.substring(json.indexOf("-")+1);
         if(json.contains("~")) {
             json = json.substring(0, json.indexOf("~"));
@@ -139,6 +145,7 @@ private String getDefaultJson(byte[] data) throws Exception{
     public <T> T dataObjectDecode(byte[] data,Class<T> clz){
         try{
             String json = getDefaultJson(data);
+            if(json == null)return null;
 
             //{main-object}|cn.jsmod2.player-xxx:xxx|cn.jsmod2.team-class:xxx
             String[] props = splitJson(json);

JPLS/src/main/java/cn/jsmod2/core/protocol/Response.java

@@ -51,6 +51,9 @@ public List getProtocolArray(boolean getArray){
         //转化为base64解密后的，之后再加密 getBytes
         try {
             String message = new String(Base64.getDecoder().decode(future.get()), properties.getProperty(FileSystem.SERVER_DECODE));
+            if(message.equals("null")){
+                return null;
+            }
             String[] protocols = message.split("@!");
             if(!getArray) {
                 for (String protocol : protocols) {