dgeary 01/01/18 17:26:01 Modified: src/share/org/apache/struts/taglib/template GetTag.java InsertTag.java Log: removed flushes from insert and put template tags Revision Changes Path 1.5 +4 -5 jakarta-struts/src/share/org/apache/struts/taglib/template/GetTag.java Index: GetTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/GetTag.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- GetTag.java 2001/01/16 23:48:41 1.4 +++ GetTag.java 2001/01/19 01:26:01 1.5 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/GetTag.java,v 1.4 2001/01/16 23:48:41 dgeary Exp $ - * $Revision: 1.4 $ - * $Date: 2001/01/16 23:48:41 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/GetTag.java,v 1.5 2001/01/19 01:26:01 dgeary Exp $ + * $Revision: 1.5 $ + * $Date: 2001/01/19 01:26:01 $ * * ==================================================================== * @@ -75,7 +75,7 @@ * it, depending upon the value of the content's direct attribute. * * @author David Geary - * @version $Revision: 1.4 $ $Date: 2001/01/16 23:48:41 $ + * @version $Revision: 1.5 $ $Date: 2001/01/19 01:26:01 $ */ public class GetTag extends TagSupport { @@ -141,7 +141,6 @@ } else { try { - pageContext.getOut().flush(); pageContext.include(content.toString()); } catch(Exception ex) { 1.3 +5 -7 jakarta-struts/src/share/org/apache/struts/taglib/template/InsertTag.java Index: InsertTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/InsertTag.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- InsertTag.java 2000/10/12 23:05:21 1.2 +++ InsertTag.java 2001/01/19 01:26:01 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/InsertTag.java,v 1.2 2000/10/12 23:05:21 craigmcc Exp $ - * $Revision: 1.2 $ - * $Date: 2000/10/12 23:05:21 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/InsertTag.java,v 1.3 2001/01/19 01:26:01 dgeary Exp $ + * $Revision: 1.3 $ + * $Date: 2001/01/19 01:26:01 $ * * ==================================================================== * @@ -74,7 +74,7 @@ * tags, which are accessed by <template:get> in the template. * * @author David Geary - * @version $Revision: 1.2 $ $Date: 2000/10/12 23:05:21 $ + * @version $Revision: 1.3 $ $Date: 2001/01/19 01:26:01 $ */ public class InsertTag extends TagSupport { @@ -118,13 +118,11 @@ } /** - * Process the end tag by including the template. The flush is necessary - * for some errant servlet containers. + * Process the end tag by including the template. */ public int doEndTag() throws JspException { try { - pageContext.getOut().flush(); pageContext.include(template); } catch(Exception ex) { // IOException or ServletException