svn commit: r921255 - in /tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib: GetAsStringTag.java InsertAttributeTag.java

[apetrelli]

Author: apetrelli
Date: Wed Mar 10 09:10:04 2010
New Revision: 921255

URL: http://svn.apache.org/viewvc?rev=921255&view=rev
Log:
TILES-501
Applied patch by Sam Lawrence.

Modified:
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java

Modified: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java?rev=921255&r1=921254&r2=921255&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java
 Wed Mar 10 09:10:04 2010
@@ -310,7 +310,7 @@ public class GetAsStringTag extends Simp
         JspWriter writer = jspContext.getOut();
         JspUtil.evaluateFragment(getJspBody());
         model.end(JspUtil.getComposeStack(jspContext), JspUtil
-                .getContainer(jspContext), writer, ignore,
+                .getCurrentContainer(jspContext), writer, ignore,
                 jspContext);
     }
 }

Modified: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java?rev=921255&r1=921254&r2=921255&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java
 Wed Mar 10 09:10:04 2010
@@ -309,6 +309,6 @@ public class InsertAttributeTag extends 
                 (Attribute) value, jspContext);
         JspUtil.evaluateFragment(getJspBody());
         model.end(JspUtil.getComposeStack(jspContext), JspUtil
-                .getContainer(jspContext), ignore, jspContext);
+                .getCurrentContainer(jspContext), ignore, jspContext);
     }
 }