check if database fields are not null

keeps · Nov 11, 2024 · 35aed10 · 35aed10
1 parent c7c77f0
commit 35aed10
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/com/databasepreservation/common/client/common/lists/DatabaseList.java b/src/main/java/com/databasepreservation/common/client/common/lists/DatabaseList.java
@@ -77,7 +77,7 @@ protected void configureDisplay(CellTable<ViewerDatabase> display) {
     Column<ViewerDatabase, SafeHtml> nameColumn = new TooltipColumn<ViewerDatabase>() {
       @Override
       public SafeHtml getValue(ViewerDatabase database) {
-        return database != null && database.getMetadata() != null
+        return database != null && database.getMetadata() != null && database.getMetadata().getName() != null
           ? SafeHtmlUtils.fromString(database.getMetadata().getName())
           : SafeHtmlUtils.fromString("unknown");
       }
@@ -95,7 +95,7 @@ public SafeHtml getValue(ViewerDatabase database) {
     Column<ViewerDatabase, SafeHtml> dbmsColumn = new TooltipColumn<ViewerDatabase>() {
       @Override
       public SafeHtml getValue(ViewerDatabase database) {
-        return database != null && database.getMetadata() != null
+        return database != null && database.getMetadata() != null && database.getMetadata().getDatabaseProduct() != null
           ? SafeHtmlUtils.fromString(database.getMetadata().getDatabaseProduct())
           : SafeHtmlUtils.fromString("unknown");
       }
@@ -114,6 +114,7 @@ public SafeHtml getValue(ViewerDatabase database) {
       @Override
       public SafeHtml getValue(ViewerDatabase database) {
         return database != null && database.getMetadata() != null
+          && database.getMetadata().getArchivalDate() != null
           ? SafeHtmlUtils.fromString(database.getMetadata().getArchivalDate().substring(0, 10))
           : null;
       }