From 53adbf1d5325f5ebc2c5b14694d7ecd82b65d0c1 Mon Sep 17 00:00:00 2001 From: Gethin James Date: Thu, 1 Jun 2017 11:09:08 +0000 Subject: [PATCH] Merged searchrep (5.2.1) to 5.2.N (5.2.1) 136724 gjames: SEARCH339: Interval null property handling git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137046 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java b/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java index 6a05f0bccf..429eb42611 100644 --- a/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java +++ b/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java @@ -973,8 +973,8 @@ public class SolrQueryHTTPClient implements BeanFactoryAware, InitializingBean PropertyDefinition propertyDef = QueryParserUtils.matchPropertyDefinition(searchParameters.getNamespace(), namespaceDAO, dictionaryService, interval.getField()); - if (propertyDef.getDataType().getName().equals(DataTypeDefinition.DATETIME) - || propertyDef.getDataType().getName().equals(DataTypeDefinition.DATE)) + if (propertyDef != null && (propertyDef.getDataType().getName().equals(DataTypeDefinition.DATETIME) + || propertyDef.getDataType().getName().equals(DataTypeDefinition.DATE))) { isDate = true; }