Author: ssanjamt
Date: 2008-02-07 15:29:10 +0100 (Thu, 07 Feb 2008)
New Revision: 6096
Modified:
branches/2.16/war/src/main/java/no/sesat/search/view/taglib/AbstractVelocityTemplateTag.java
Log:
SEARCH-4233 NPE AbstractVelocityTemplateTag.java:92
Modified:
branches/2.16/war/src/main/java/no/sesat/search/view/taglib/AbstractVelocityTemplateTag.java
===================================================================
---
branches/2.16/war/src/main/java/no/sesat/search/view/taglib/AbstractVelocityTemplateTag.java
2008-02-07 09:43:48 UTC (rev 6095)
+++
branches/2.16/war/src/main/java/no/sesat/search/view/taglib/AbstractVelocityTemplateTag.java
2008-02-07 14:29:10 UTC (rev 6096)
@@ -34,6 +34,7 @@
import javax.servlet.jsp.tagext.SimpleTagSupport;
import no.sesat.search.datamodel.DataModel;
import no.sesat.search.datamodel.generic.StringDataObject;
+import no.sesat.search.datamodel.request.ParametersDataObject;
import no.sesat.search.http.filters.SiteLocatorFilter;
import no.sesat.search.run.RunningQueryImpl;
import no.sesat.search.site.Site;
@@ -89,7 +90,8 @@
final PageContext cxt = (PageContext) getJspContext();
if(null != cxt && null != datamodel && null != datamodel.getPage()){
final SearchTab tab = datamodel.getPage().getCurrentTab();
- final StringDataObject layoutDO =
datamodel.getParameters().getValue(RunningQueryImpl.PARAM_LAYOUT);
+ final ParametersDataObject params = datamodel.getParameters();
+ final StringDataObject layoutDO = null != params ?
params.getValue(RunningQueryImpl.PARAM_LAYOUT) : null;
layout = null != cxt.getAttribute("layout") ?
(Layout)cxt.getAttribute("layout") : null != layoutDO && null != tab && null !=
tab.getLayouts()
? tab.getLayouts().get(layoutDO.getXmlEscaped())
: null != tab ? tab.getDefaultLayout() : null;
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
