Author: ssmiweve
Date: 2008-03-05 08:30:31 +0100 (Wed, 05 Mar 2008)
New Revision: 6222
Modified:
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
Log:
SEARCH-4237 - AbstractSearchCommand, NullPointerException
Modified:
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
===================================================================
---
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2008-03-04 15:22:10 UTC (rev 6221)
+++
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2008-03-05 07:30:31 UTC (rev 6222)
@@ -477,19 +477,19 @@
final StopWatch watch = new StopWatch();
watch.start();
- final String query = null != getTransformedQuery() ?
getTransformedQuery().trim() : "";
+ final String notNullQuery = null != getTransformedQuery() ?
getTransformedQuery().trim() : "";
Integer hitCount = null;
try {
// we will be executing the command IF there's a valid query or
filter,
// or if the configuration specifies that we should run anyway.
- boolean executeQuery =
"*".equals(datamodel.getQuery().getString());
- executeQuery |= query.length() > 0 ||
getSearchConfiguration().isRunBlank();
+ boolean executeQuery = null != datamodel.getQuery() &&
"*".equals(datamodel.getQuery().getString());
+ executeQuery |= notNullQuery.length() > 0 ||
getSearchConfiguration().isRunBlank();
executeQuery |= null != filter && 0 < filter.length();
executeQuery |= null != additionalFilter && 0 <
additionalFilter.length();
- LOG.info("executeQuery==" + executeQuery + " ; query:" + query + "
; filter:" + filter);
+ LOG.info("executeQuery==" + executeQuery + " ; query:" +
notNullQuery + " ; filter:" + filter);
final ResultList<? extends ResultItem> result = executeQuery
? execute()
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
