Author: ssmiweve
Date: 2008-03-05 08:56:19 +0100 (Wed, 05 Mar 2008)
New Revision: 6224
Modified:
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
Log:
> java.lang.NullPointerException
> at
> no.sesat.search.mode.command.AbstractSearchCommand.getOffset(AbstractSearchCommand.java:592)
cleaner version of r6223
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-05 07:55:31 UTC (rev 6223)
+++
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2008-03-05 07:56:19 UTC (rev 6224)
@@ -601,7 +601,13 @@
public boolean isPaginated(){
- final Nav offsetNav =
context.getDataModel().getNavigation().getConfiguration().getNavMap().get(OFFSET_KEY);
+ final boolean navMapExists = null !=
context.getDataModel().getNavigation()
+ && null !=
context.getDataModel().getNavigation().getConfiguration();
+
+ final Nav offsetNav = navMapExists
+ ?
context.getDataModel().getNavigation().getConfiguration().getNavMap().get(OFFSET_KEY)
+ : null;
+
return null != offsetNav &&
getSearchConfiguration().getName().equals(offsetNav.getCommandName());
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
