Skip to content
Snippets Groups Projects
Commit 5a9bd7ad authored by anttil's avatar anttil
Browse files

Fix NullPointerExceptions in v3 api date based search

SVN: 35728
parent 953982ff
No related branches found
No related tags found
No related merge requests found
...@@ -21,6 +21,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.DateEqualToValue; ...@@ -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.DateLaterThanOrEqualToValue;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.DateObjectEarlierThanOrEqualToValue; 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.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.ethz.sis.openbis.generic.asapi.v3.dto.common.search.IDate;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IAttributeSearchFieldKind; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IAttributeSearchFieldKind;
...@@ -39,7 +40,7 @@ public abstract class AbstractEntityAttributeProvider implements IEntityAttribut ...@@ -39,7 +40,7 @@ public abstract class AbstractEntityAttributeProvider implements IEntityAttribut
} else if (date instanceof DateEarlierThanOrEqualToValue || date instanceof DateObjectEarlierThanOrEqualToValue) } else if (date instanceof DateEarlierThanOrEqualToValue || date instanceof DateObjectEarlierThanOrEqualToValue)
{ {
return earlier; return earlier;
} else if (date instanceof DateLaterThanOrEqualToValue || date instanceof DateLaterThanOrEqualToValue) } else if (date instanceof DateLaterThanOrEqualToValue || date instanceof DateObjectLaterThanOrEqualToValue)
{ {
return later; return later;
} else } else
......
...@@ -33,7 +33,7 @@ public abstract class AbstractDateObjectValue extends AbstractValue<Date> implem ...@@ -33,7 +33,7 @@ public abstract class AbstractDateObjectValue extends AbstractValue<Date> implem
protected String getFormattedValue() protected String getFormattedValue()
{ {
return null; return getValue().toString();
} }
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment