Handle description and tag updates (#2856)

open-metadata · Feb 19, 2022 · a8990b9 · a8990b9
1 parent 647712c
commit a8990b9
Showing 1 changed file with 4 additions and 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
@@ -842,10 +842,12 @@ private void updateColumns(
       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());
           }
         }