Merge remote-tracking branch 'refs/remotes/origin/dev/4.3.2' into leb…

…ie_432_bugfix_0919_6
oceanbase · Sep 19, 2024 · 9917466 · 9917466
2 parents a7b160d + 506220f
commit 9917466
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...c/main/java/com/oceanbase/odc/service/schedule/factory/ScheduleResponseMapperFactory.java b/...c/main/java/com/oceanbase/odc/service/schedule/factory/ScheduleResponseMapperFactory.java
@@ -376,7 +376,8 @@ private List<Database> getDatabaseByIds(Set<Long> ids) {
  Map<Long, ConnectionConfig> id2Connection = dataSourceService.innerListByIds(connectionIds)
  .stream().collect(Collectors.toMap(ConnectionConfig::getId, o -> o));
  databases.forEach(database -> {
- if (id2Connection.containsKey(database.getDataSource().getId())) {
+ if (Objects.nonNull(database.getDataSource())
+ && id2Connection.containsKey(database.getDataSource().getId())) {
  database.setDataSource(id2Connection.get(database.getDataSource().getId()));
  }
  });