[inlong] branch master updated: [INLONG-8425][Manager] Fix error in obtaining audit information when sink is not configured (#8427)

[dockerzhang]

This is an automated email from the ASF dual-hosted git repository.

dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new df0e90c0c2 [INLONG-8425][Manager] Fix error in obtaining audit 
information when sink is not configured (#8427)
df0e90c0c2 is described below

commit df0e90c0c28fd2da070ade6bbdbf76f951632ca8
Author: fuweng11 <76141879+fuwen...@users.noreply.github.com>
AuthorDate: Wed Jul 5 15:19:05 2023 +0800

    [INLONG-8425][Manager] Fix error in obtaining audit information when sink 
is not configured (#8427)
---
 .../manager/service/core/impl/AuditServiceImpl.java       | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AuditServiceImpl.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AuditServiceImpl.java
index df2cbc6748..1e08785c6e 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AuditServiceImpl.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AuditServiceImpl.java
@@ -191,11 +191,16 @@ public class AuditServiceImpl implements AuditService {
         // this is temporary behavior before multiple sinks in one stream is 
fully supported.
         String sinkNodeType = null;
         Integer sinkId = request.getSinkId();
-        if (sinkId == null) {
-            List<StreamSinkEntity> sinkEntityList = 
sinkEntityMapper.selectByRelatedId(groupId, streamId);
-            sinkNodeType = sinkEntityList.get(0).getSinkType();
-        } else {
-            StreamSinkEntity sinkEntity = 
sinkEntityMapper.selectByPrimaryKey(sinkId);
+        StreamSinkEntity sinkEntity = null;
+        List<StreamSinkEntity> sinkEntityList = 
sinkEntityMapper.selectByRelatedId(groupId, streamId);
+        if (sinkId != null) {
+            sinkEntity = sinkEntityMapper.selectByPrimaryKey(sinkId);
+        } else if (CollectionUtils.isNotEmpty(sinkEntityList)) {
+            sinkEntity = sinkEntityList.get(0);
+        }
+
+        // if sink info is existed, get sink type for query audit info.
+        if (sinkEntity != null) {
             sinkNodeType = sinkEntity.getSinkType();
         }