Author: sshafroi
Date: 2008-11-25 16:56:20 +0100 (Tue, 25 Nov 2008)
New Revision: 6986
Modified:
branches/2.18/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java
Log:
Issue SKER5020: (SearchTabMainTag.java provoces NPE before 'missing template'
can be outputted)
applied patch
Modified:
branches/2.18/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java
===================================================================
---
branches/2.18/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java
2008-11-25 15:09:00 UTC (rev 6985)
+++
branches/2.18/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java
2008-11-25 15:56:20 UTC (rev 6986)
@@ -86,13 +86,12 @@
final DataModel datamodel = (DataModel)
cxt.findAttribute(DataModel.KEY);
final Layout layout = findLayout(datamodel);
- final String front = null != layout.getFront() && 0 <
layout.getFront().length()
- ? layout.getFront()
- : null;
+ final String front = (layout!=null && layout.getFront()!=null &&
layout.getFront().length()>0)?layout.getFront():null;
+ final String main = (layout!=null && layout.getMain()!=null &&
layout.getMain().length()>0)?layout.getMain():null;
String include = datamodel.getQuery() != null &&
datamodel.getQuery().getQuery().isBlank() && null != front
? front
- : layout.getMain();
+ : main;
try{
if(null != include){
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
