From 5a9bd7ad6e45c43fc586359f7bca3a7f6f0023c4 Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Wed, 24 Feb 2016 12:40:49 +0000
Subject: [PATCH] Fix NullPointerExceptions in v3 api date based search

SVN: 35728
---
 .../v3/translator/search/AbstractEntityAttributeProvider.java  | 3 ++-
 .../asapi/v3/dto/common/search/AbstractDateObjectValue.java    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/AbstractEntityAttributeProvider.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/AbstractEntityAttributeProvider.java
index c48fd303f18..22d95abd94f 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/AbstractEntityAttributeProvider.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/AbstractEntityAttributeProvider.java
@@ -21,6 +21,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.DateEqualToValue;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.DateLaterThanOrEqualToValue;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.DateObjectEarlierThanOrEqualToValue;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.DateObjectEqualToValue;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.DateObjectLaterThanOrEqualToValue;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.IDate;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IAttributeSearchFieldKind;
 
@@ -39,7 +40,7 @@ public abstract class AbstractEntityAttributeProvider implements IEntityAttribut
         } else if (date instanceof DateEarlierThanOrEqualToValue || date instanceof DateObjectEarlierThanOrEqualToValue)
         {
             return earlier;
-        } else if (date instanceof DateLaterThanOrEqualToValue || date instanceof DateLaterThanOrEqualToValue)
+        } else if (date instanceof DateLaterThanOrEqualToValue || date instanceof DateObjectLaterThanOrEqualToValue)
         {
             return later;
         } else
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateObjectValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateObjectValue.java
index ca908730448..1e91dc37538 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateObjectValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateObjectValue.java
@@ -33,7 +33,7 @@ public abstract class AbstractDateObjectValue extends AbstractValue<Date> implem
 
     protected String getFormattedValue()
     {
-        return null;
+        return getValue().toString();
     }
 
 }
\ No newline at end of file
-- 
GitLab