Author: ssmiweve
Date: 2008-02-10 18:31:28 +0100 (Sun, 10 Feb 2008)
New Revision: 6103
Modified:
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
Log:
avoid NPE
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-02-10 10:54:02 UTC (rev 6102)
+++
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2008-02-10 17:31:28 UTC (rev 6103)
@@ -425,6 +425,10 @@
// Protected -----------------------------------------------------
/** Get the results from another search command waiting if neccessary.
+ * @param id
+ * @param datamodel
+ * @return
+ * @throws java.lang.InterruptedException
*/
protected final ResultList<? extends ResultItem> getSearchResult(
final String id,
@@ -471,7 +475,7 @@
final StopWatch watch = new StopWatch();
watch.start();
- final String query = getTransformedQuery().trim();
+ final String query = null != getTransformedQuery() ?
getTransformedQuery().trim() : "";
Integer hitCount = null;
try {
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
