Author: ssmiweve
Date: 2008-01-31 21:40:26 +0100 (Thu, 31 Jan 2008)
New Revision: 6073
Modified:
branches/2.16/war/src/main/java/no/sesat/search/view/taglib/AbstractVelocityTemplateTag.java
Log:
fix to r6072
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-01-31 13:21:08 UTC (rev 6072)
+++
branches/2.16/war/src/main/java/no/sesat/search/view/taglib/AbstractVelocityTemplateTag.java
2008-01-31 20:40:26 UTC (rev 6073)
@@ -85,13 +85,16 @@
*/
protected final Layout findLayout(final DataModel datamodel){
+ Layout layout = null;
final PageContext cxt = (PageContext) getJspContext();
- final SearchTab tab = datamodel.getPage().getCurrentTab();
- final StringDataObject layoutDO =
datamodel.getParameters().getValue(RunningQueryImpl.PARAM_LAYOUT);
- final Layout layout = null != cxt.getAttribute("layout") ?
(Layout)cxt.getAttribute("layout") : null != layoutDO
- ? tab.getLayouts().get(layoutDO.getXmlEscaped())
- : tab.getDefaultLayout();
- cxt.setAttribute("layout", layout);
+ if(null != cxt && null != datamodel && null != datamodel.getPage()){
+ final SearchTab tab = datamodel.getPage().getCurrentTab();
+ final StringDataObject layoutDO =
datamodel.getParameters().getValue(RunningQueryImpl.PARAM_LAYOUT);
+ layout = null != cxt.getAttribute("layout") ?
(Layout)cxt.getAttribute("layout") : null != layoutDO
+ ? tab.getLayouts().get(layoutDO.getXmlEscaped())
+ : tab.getDefaultLayout();
+ cxt.setAttribute("layout", layout);
+ }
return layout;
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
