From df75eb7d97d42ddbeced0f6480587a57ad007f89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Wed, 1 Dec 2021 09:28:21 +0800 Subject: [PATCH] Fix a wrong check about entity if GraphQL at the endpoint relation level. (#8218) --- CHANGES.md | 1 + .../apache/skywalking/oap/server/core/query/input/Entity.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 674ebf5b1e..a8345175d6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -63,6 +63,7 @@ Release Notes. * Add customized envoy ALS protocol receiver for satellite transmit batch data. * Remove `logback` dependencies in IoTDB plugin. * Fix `StorageModuleElasticsearchProvider` doesn't watch on `trustStorePath`. +* Fix a wrong check about entity if GraphQL at the endpoint relation level. #### UI diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/Entity.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/Entity.java index 8909fb017c..b8fb5d518f 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/Entity.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/Entity.java @@ -89,7 +89,7 @@ public class Entity { && Objects.nonNull(serviceInstanceName) && Objects.nonNull(destServiceInstanceName) && Objects.nonNull(normal) && Objects.nonNull(destNormal); case EndpointRelation: - return Objects.nonNull(serviceName) && Objects.nonNull(endpointName) + return Objects.nonNull(serviceName) && Objects.nonNull(destServiceName) && Objects.nonNull(endpointName) && Objects.nonNull(destEndpointName) && Objects.nonNull(normal) && Objects.nonNull(destNormal); default: -- GitLab