fix(aspects): fix null aspects case (datahub-project#3501)

shirshanka · Nov 6, 2021 · f74c297 · f74c297
1 parent d79f25b
commit f74c297
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/aspect/AspectType.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/aspect/AspectType.java
@@ -31,6 +31,10 @@ public List<DataFetcherResult<Aspect>> batchLoad(@Nonnull List<VersionedAspectKe
       return keys.stream().map(key -> {
         try {
           VersionedAspect entity = _entityClient.getAspect(key.getUrn(), key.getAspectName(), key.getVersion(), context.getActor());
+          if (entity == null) {
+            return DataFetcherResult.<Aspect>newResult().data(null).build();
+          }
+
           return DataFetcherResult.<Aspect>newResult().data(AspectMapper.map(entity)).build();
         } catch (RemoteInvocationException e) {
           if (e instanceof RestLiResponseException) {