From 4e3b30cbcab0251e652f1f3876d263f5e55d0811 Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Tue, 2 Feb 2016 13:01:54 +0000
Subject: [PATCH] SSDM-3112: fix null checks
SVN: 35611
---
.../cisd/openbis/generic/shared/dto/DataGlobalSearchBridge.java | 1 -
.../cisd/openbis/generic/shared/dto/GlobalSearchBridge.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataGlobalSearchBridge.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataGlobalSearchBridge.java
index 4fe56973a70..5c595dad94d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataGlobalSearchBridge.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataGlobalSearchBridge.java
@@ -14,7 +14,6 @@ public class DataGlobalSearchBridge<T extends DataPE> extends GlobalSearchBridge
put(values, "Perm ID", data.getPermId());
put(values, "Registration date", dateFormat.format(data.getRegistrationDate()));
put(values, "Modification date", dateFormat.format(data.getModificationDate()));
- put(values, "Access date", dateFormat.format(data.getAccessDate()));
put(values, "DataSet type", data.getDataSetType().getCode());
addProperties(values, data.getProperties());
addPerson(values, "registrator", data.getRegistrator());
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/GlobalSearchBridge.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/GlobalSearchBridge.java
index e45af68f588..32691cbd5d0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/GlobalSearchBridge.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/GlobalSearchBridge.java
@@ -160,7 +160,7 @@ public abstract class GlobalSearchBridge<T extends IEntityWithMetaprojects> impl
List<String> indexedValues = new ArrayList<>();
for (Map.Entry<String, IndexedValue> entry : data.entrySet())
{
- if (entry.getValue() == null)
+ if (entry.getValue().displayValue == null)
{
continue;
}
--
GitLab