Author: daniele
Date: 2007-06-01 12:38:44 +0200 (Fri, 01 Jun 2007)
New Revision: 5249
Modified:
branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
Log:
SEARCH-2702: NullPointer fixed in getSortBy(), reverted type of flags from
Boolean objects to boolean primitives again.
Modified:
branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
===================================================================
---
branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
2007-06-01 10:19:54 UTC (rev 5248)
+++
branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
2007-06-01 10:38:44 UTC (rev 5249)
@@ -79,8 +79,8 @@
/** boolean flags to which get set during visitor pass.
* used by getSortBy to determin which rank profile to use.
*/
- private Boolean whoQueryIsCompanyName = null;
- private Boolean whoQueryIsKeyword = null;
+ private boolean whoQueryIsCompanyName;
+ private boolean whoQueryIsKeyword;
/** Logger for this class. */
private static final Logger LOG =
Logger.getLogger(CatalogueSearchCommand.class);
@@ -581,7 +581,7 @@
private void checkQueryForKeyword(final Clause clause){
// check if this is a known keyword.
- if(null == whoQueryIsKeyword){
+ if(!whoQueryIsKeyword){
whoQueryIsKeyword =
clause.getKnownPredicates().contains(TokenPredicate.COMPANY_KEYWORD);
}
}
@@ -589,7 +589,7 @@
private void checkQueryForCompanyname(final Clause clause){
// check if this is a known company name.
- if(null == whoQueryIsCompanyName){
+ if(!whoQueryIsCompanyName){
whoQueryIsCompanyName =
clause.getKnownPredicates().contains(TokenPredicate.COMPANYENRICHMENT);
}
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
