Author: ssanjamt
Date: 2008-02-05 14:55:22 +0100 (Tue, 05 Feb 2008)
New Revision: 6087
Modified:
branches/2.16/war/src/main/java/no/sesat/search/view/taglib/AbstractVelocityTemplateTag.java
Log:
SEARCH-4198
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-05 12:41:50 UTC (rev 6086)
+++
branches/2.16/war/src/main/java/no/sesat/search/view/taglib/AbstractVelocityTemplateTag.java
2008-02-05 13:55:22 UTC (rev 6087)
@@ -92,7 +92,7 @@
final StringDataObject layoutDO =
datamodel.getParameters().getValue(RunningQueryImpl.PARAM_LAYOUT);
layout = null != cxt.getAttribute("layout") ?
(Layout)cxt.getAttribute("layout") : null != layoutDO && null != tab && null !=
tab.getLayouts()
? tab.getLayouts().get(layoutDO.getXmlEscaped())
- : tab.getDefaultLayout();
+ : null != tab ? tab.getDefaultLayout() : null;
cxt.setAttribute("layout", layout);
}
return layout;
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
