From cfecfb799b91459e825c2104ab6fa25d07e4f7f1 Mon Sep 17 00:00:00 2001
From: simon824 <zhangshiming@cvte.com>
Date: Fri, 12 Jun 2020 09:59:40 +0800
Subject: [PATCH] 1. change windows new line 'CR' to linux new line 'LF' 2.
 solve conflict

---
 .../org/apache/dolphinscheduler/common/utils/JSONUtils.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java
index c78ceb2d5..20209c0a9 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java
@@ -119,7 +119,7 @@ public class JSONUtils {
      */
     public static <T> List<T> toList(String json, Class<T> clazz) {
         if (StringUtils.isEmpty(json)) {
-            return new ArrayList<>();
+            return Collections.emptyList();
         }
 
         try {
@@ -130,7 +130,7 @@ public class JSONUtils {
             logger.error("parse list exception!", e);
         }
 
-        return new ArrayList<>();
+        return Collections.emptyList();
     }
 
 
-- 
GitLab