Author: ssmiweve
Date: 2008-03-05 08:55:31 +0100 (Wed, 05 Mar 2008)
New Revision: 6223

Modified:
   
branches/2.16.0/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)


Modified: 
branches/2.16.0/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
===================================================================
--- 
branches/2.16.0/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
    2008-03-05 07:30:31 UTC (rev 6222)
+++ 
branches/2.16.0/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
    2008-03-05 07:55:31 UTC (rev 6223)
@@ -71,6 +71,7 @@
 import java.util.List;
 import java.util.Map;
 import no.sesat.search.datamodel.access.DataModelAccessException;
+import no.sesat.search.view.navigation.NavigationConfig;
 import no.sesat.search.view.navigation.NavigationConfig.Nav;
 
 /** The base abstraction for Search Commands providing a large framework for 
commands to run against.
@@ -589,12 +590,17 @@
     protected int getOffset(){
         
         int offset = 0;
-        final Nav offsetNav = 
context.getDataModel().getNavigation().getConfiguration().getNavMap().get(OFFSET_KEY);
         
-        if(null != offsetNav && 
getSearchConfiguration().getName().equals(offsetNav.getCommandName())){
-            final StringDataObject offsetString = 
context.getDataModel().getParameters().getValue(OFFSET_KEY);
-            if( null != offsetString ){
-                offset = Integer.parseInt(offsetString.getUtf8UrlEncoded());
+        if(null != context.getDataModel().getNavigation() 
+                && null != 
context.getDataModel().getNavigation().getConfiguration()){
+                
+            final Nav offsetNav = 
context.getDataModel().getNavigation().getConfiguration().getNavMap().get(OFFSET_KEY);
+            if(null != offsetNav && 
getSearchConfiguration().getName().equals(offsetNav.getCommandName())){
+
+                final StringDataObject offsetString = 
context.getDataModel().getParameters().getValue(OFFSET_KEY);
+                if( null != offsetString ){
+                    offset = 
Integer.parseInt(offsetString.getUtf8UrlEncoded());
+                }
             }
         }
         return offset;

_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits

Reply via email to