Author: ssmiweve
Date: 2008-01-21 11:04:13 +0100 (Mon, 21 Jan 2008)
New Revision: 5992
Modified:
trunk/view-config-spi/src/main/java/no/sesat/search/view/SearchTabFactory.java
trunk/view-config-spi/src/main/java/no/sesat/search/view/config/SearchTab.java
Log:
NPE with expecting the defaultLayout to have been inherited
Modified:
trunk/view-config-spi/src/main/java/no/sesat/search/view/SearchTabFactory.java
===================================================================
---
trunk/view-config-spi/src/main/java/no/sesat/search/view/SearchTabFactory.java
2008-01-21 08:04:25 UTC (rev 5991)
+++
trunk/view-config-spi/src/main/java/no/sesat/search/view/SearchTabFactory.java
2008-01-21 10:04:13 UTC (rev 5992)
@@ -429,7 +429,7 @@
parseBoolean(tabE.getAttribute("execute-on-blank"),
inherit != null
? inherit.isExecuteOnBlank()
: false),
- defaultLayout,
+ null != defaultLayout ? defaultLayout :
defaultInheritedLayout,
layouts,
scope);
Modified:
trunk/view-config-spi/src/main/java/no/sesat/search/view/config/SearchTab.java
===================================================================
---
trunk/view-config-spi/src/main/java/no/sesat/search/view/config/SearchTab.java
2008-01-21 08:04:25 UTC (rev 5991)
+++
trunk/view-config-spi/src/main/java/no/sesat/search/view/config/SearchTab.java
2008-01-21 10:04:13 UTC (rev 5992)
@@ -100,7 +100,8 @@
* @param defaultLayout
* @param displayCss
* @param executeOnBlank
- * @param layouts
+ * @param layouts
+ * @param scope
*/
public SearchTab(
final SearchTab inherit,
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
