Author: jdonnerstag
Date: Sat Jan 24 09:01:54 2009
New Revision: 737320
URL: http://svn.apache.org/viewvc?rev=737320&view=rev
Log:
fixed wicket-2039: Fragment#getAssociatedMarkupStream() doesn't look for Parent
in the proper way
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java?rev=737320&r1=737319&r2=737320&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java
Sat Jan 24 09:01:54 2009
@@ -349,9 +349,18 @@
}
// if self doesn't have markup stream try the parent's
- if ((stream == null) && (getParent() != null))
+ if (stream == null)
{
- stream = getParent().getAssociatedMarkupStream(false);
+ MarkupContainer container = getParent();
+ while (container != null)
+ {
+ if (container.hasAssociatedMarkup())
+ {
+ stream =
container.getAssociatedMarkupStream(false);
+ break;
+ }
+ container = container.getParent();
+ }
}
// if we cant find any markup stream
