From 24087ce31e53ab5daa02d40dd56ebacf407b6362 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 3 Feb 2014 11:20:46 +0100
Subject: [PATCH] OO-965: check if there is a date before building the lucene
query
---
.../olat/search/ui/AdvancedSearchInputController.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/search/ui/AdvancedSearchInputController.java b/src/main/java/org/olat/search/ui/AdvancedSearchInputController.java
index 3d820835b32..d40f17f9895 100644
--- a/src/main/java/org/olat/search/ui/AdvancedSearchInputController.java
+++ b/src/main/java/org/olat/search/ui/AdvancedSearchInputController.java
@@ -22,6 +22,7 @@ package org.olat.search.ui;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Properties;
@@ -235,10 +236,16 @@ public class AdvancedSearchInputController extends FormBasicController {
appendAnd(queries, AbstractOlatDocument.DESCRIPTION_FIELD_NAME, ":(", descriptionQuery.getValue(), ") ");
}
if (StringHelper.containsNonWhitespace(createdDate.getValue())) {
- appendAnd(queries, AbstractOlatDocument.CREATED_FIELD_NAME, ":(", format.format(createdDate.getDate()), ") ");
+ Date creationDate = createdDate.getDate();
+ if(creationDate != null) {
+ appendAnd(queries, AbstractOlatDocument.CREATED_FIELD_NAME, ":(", format.format(creationDate), ") ");
+ }
}
if (StringHelper.containsNonWhitespace(modifiedDate.getValue())) {
- appendAnd(queries, AbstractOlatDocument.CHANGED_FIELD_NAME, ":(", format.format(modifiedDate.getDate()), ") ");
+ Date modificationDate = modifiedDate.getDate();
+ if(modificationDate != null) {
+ appendAnd(queries, AbstractOlatDocument.CHANGED_FIELD_NAME, ":(", format.format(modificationDate), ") ");
+ }
}
//Check for null on metadata element since it might not be configured and initialized
if (metadataQuery != null && StringHelper.containsNonWhitespace(metadataQuery.getValue())) {
--
GitLab