From e3e68194b6f2e042473d78157600c8a680592f35 Mon Sep 17 00:00:00 2001
From: xlinliu <xlinliu@163.com>
Date: Wed, 8 Nov 2023 15:29:19 +0800
Subject: [PATCH 1/2] update xstream

---
 assembly/dss-package/pom.xml           | 8 ++++++++
 dss-apps/dss-apiservice-server/pom.xml | 5 -----
 dss-apps/dss-scriptis-server/pom.xml   | 9 ++++-----
 pom.xml                                | 2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/assembly/dss-package/pom.xml b/assembly/dss-package/pom.xml
index 45734374b5..956109a2ad 100644
--- a/assembly/dss-package/pom.xml
+++ b/assembly/dss-package/pom.xml
@@ -52,8 +52,16 @@
                     <artifactId>hibernate-validator</artifactId>
                     <groupId>org.hibernate.validator</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>xstream</artifactId>
+                    <groupId>com.thoughtworks.xstream</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <artifactId>xstream</artifactId>
+            <groupId>com.thoughtworks.xstream</groupId>
+        </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-common</artifactId>
diff --git a/dss-apps/dss-apiservice-server/pom.xml b/dss-apps/dss-apiservice-server/pom.xml
index f934043e7c..ed70fab1ad 100644
--- a/dss-apps/dss-apiservice-server/pom.xml
+++ b/dss-apps/dss-apiservice-server/pom.xml
@@ -341,11 +341,6 @@
 <!--            </exclusions>-->
 <!--        </dependency>-->
 
-        <dependency>
-            <artifactId>xstream</artifactId>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <version>1.4.19</version>
-        </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-sso-integration-standard</artifactId>
diff --git a/dss-apps/dss-scriptis-server/pom.xml b/dss-apps/dss-scriptis-server/pom.xml
index 7be4885f01..56856e6b01 100644
--- a/dss-apps/dss-scriptis-server/pom.xml
+++ b/dss-apps/dss-scriptis-server/pom.xml
@@ -67,6 +67,10 @@
                     <artifactId>linkis-common</artifactId>
                     <groupId>org.apache.linkis</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>xstream</artifactId>
+                    <groupId>com.thoughtworks.xstream</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -226,11 +230,6 @@
             <version>1.5.2</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <artifactId>xstream</artifactId>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <version>1.4.19</version>
-        </dependency>
 
     </dependencies>
     <build>
diff --git a/pom.xml b/pom.xml
index b12955e4eb..30024989d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
         <commons.math.version>3.1.1</commons.math.version>
         <commons.lang3.version>3.8.1</commons.lang3.version>
         <commons.lang.version>2.6</commons.lang.version>
-        <xstream.version>1.4.19</xstream.version>
+        <xstream.version>1.4.20</xstream.version>
         <jersey.version>2.30.1</jersey.version>
     </properties>
 

From aca8ff6f8cb89412f0d71edf9d48967af623c7d4 Mon Sep 17 00:00:00 2001
From: xlinliu <xlinliu@163.com>
Date: Thu, 9 Nov 2023 21:29:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?appconn=20=E6=9C=AA=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=AE=8C=E6=97=B6=EF=BC=8C=E4=B8=8D=E8=A6=81=E6=8A=A5NPE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dss/appconn/manager/impl/AbstractAppConnManager.java       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/src/main/java/com/webank/wedatasphere/dss/appconn/manager/impl/AbstractAppConnManager.java b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/src/main/java/com/webank/wedatasphere/dss/appconn/manager/impl/AbstractAppConnManager.java
index c429caec29..b13b8b6f09 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/src/main/java/com/webank/wedatasphere/dss/appconn/manager/impl/AbstractAppConnManager.java
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/src/main/java/com/webank/wedatasphere/dss/appconn/manager/impl/AbstractAppConnManager.java
@@ -245,6 +245,9 @@ public List<AppConn> listAppConns() {
     @Override
     public AppConn getAppConn(String appConnName) {
         lazyLoadAppConns();
+        if(appConns.isEmpty()){
+            throw new AppConnWarnException(25344,"appconn list has not been loaded,please try again later.");
+        }
         return appConns.get(appConnName.toLowerCase());
     }