Revision: 1256
http://stripes.svn.sourceforge.net/stripes/?rev=1256&view=rev
Author: bengunter
Date: 2010-06-09 00:39:44 +0000 (Wed, 09 Jun 2010)
Log Message:
-----------
STS-319: Added an explicit check to ensure layout-definition tags do not have a
parent layout tag. Simply checking that a context exists is no longer
sufficient.
Modified Paths:
--------------
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutDefinitionTag.java
Modified:
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutDefinitionTag.java
===================================================================
---
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutDefinitionTag.java
2010-06-09 00:38:21 UTC (rev 1255)
+++
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutDefinitionTag.java
2010-06-09 00:39:44 UTC (rev 1256)
@@ -44,7 +44,7 @@
if (context == null) {
context = LayoutContext.lookup(pageContext);
- if (context == null) {
+ if (context == null || getLayoutAncestor() != null) {
throw new StripesJspException("The JSP page " +
getCurrentPagePath()
+ " contains a layout-definition tag and was invoked
directly. "
+ "A layout-definition can only be invoked by a page
that contains "
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
