Author: ssmiweve
Date: 2008-03-28 13:14:27 +0100 (Fri, 28 Mar 2008)
New Revision: 6294
Modified:
branches/2.16.0/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractSimpleFastSearchCommand.java
Log:
avoid NPEs
Modified:
branches/2.16.0/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractSimpleFastSearchCommand.java
===================================================================
---
branches/2.16.0/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractSimpleFastSearchCommand.java
2008-03-28 11:54:08 UTC (rev 6293)
+++
branches/2.16.0/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractSimpleFastSearchCommand.java
2008-03-28 12:14:27 UTC (rev 6294)
@@ -660,7 +660,7 @@
}
// XXX Move out. This code is specific to Norway's mobileYellowGeo
mode!
- if (getParameter("c").equals("yg")) {
+ if (null != getParameter("c") && getParameter("c").equals("yg")) {
if (getParameter("type").equals("f")) {
params.setParameter(new SearchParameter(
"qtf_geosearch:center",
@@ -683,12 +683,12 @@
}
}
- if (getParameters().containsKey("rank")) {
+ if (null != getParameter("rank") &&
getParameters().containsKey("rank")) {
params.setParameter(new SearchParameter(BaseParameter.SORT_BY,
getParameter("rank")));
}
// This now uses sort order from canfiguration, old ones still here
for backwards compability untill all are uppdated
- if (getParameters().containsKey("userSortBy")) {
+ if (null != getParameter("userSortBy") &&
getParameters().containsKey("userSortBy")) {
final String sortBy = getParameter("userSortBy");
LOG.debug("createQuery: SortBy " + sortBy);
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
