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
This commit is contained in:
Gethin James
2017-06-01 11:09:08 +00:00
parent 2f9d4dfc6e
commit 53adbf1d53

View File

@@ -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;
}