From a8990b97f74f2897cbb36db4bd0a24cd91523133 Mon Sep 17 00:00:00 2001 From: Sriharsha Chintalapani Date: Fri, 18 Feb 2022 17:52:13 -0800 Subject: [PATCH] Handle description and tag updates (#2856) --- .../org/openmetadata/catalog/jdbi3/TableRepository.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TableRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TableRepository.java index b9a91587ae5..2f4ed902330 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TableRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TableRepository.java @@ -842,10 +842,12 @@ public class TableRepository extends EntityRepository { for (Column deleted : deletedColumns) { if (addedColumnMap.containsKey(deleted.getName())) { Column addedColumn = addedColumnMap.get(deleted.getName()); - if (addedColumn.getDescription().isEmpty() && !deleted.getDescription().isEmpty()) { + if ((addedColumn.getDescription() == null || addedColumn.getDescription().isEmpty()) + && (deleted.getDescription() == null || !deleted.getDescription().isEmpty())) { addedColumn.setDescription(deleted.getDescription()); } - if (addedColumn.getTags().isEmpty() && !deleted.getTags().isEmpty()) { + if ((addedColumn.getTags() == null || addedColumn.getTags().isEmpty()) + && (deleted.getTags() == null || !deleted.getTags().isEmpty())) { addedColumn.setTags(deleted.getTags()); } }