← Back to branch summary

~ubuntu-branches/ubuntu/lucid/libstruts1.2-java/lucid

« back to all changes in this revision

Viewing changes to src/share/org/apache/struts/taglib/tiles/InsertTag.java

  • Committer: Bazaar Package Importer
  • Author(s): Arnaud Vandyck
  • Date: 2006-04-24 12:14:23 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20060424121423-naev53qigqgks0sa
Tags: 1.2.9-1
http://bugs.debian.org/360551
New upstream  release Fixes  three security  problems: CVE-2006-1546,
CVE-2006-1547,  CVE-2006-1548  (closes:  #360551),  thanks  to  Moritz
Muehlenhoff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/share/org/apache/struts/taglib/tiles/InsertTag.java
1
1
/*
2
 
 * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/InsertTag.java,v 1.26 2004/03/14 06:23:49 sraeburn Exp $
3
 
 * $Revision: 1.26 $
4
 
 * $Date: 2004/03/14 06:23:49 $
 
2
 * $Id: InsertTag.java 165160 2005-04-28 16:29:58Z niallp $ 
5
3
 *
6
 
 * Copyright 1999-2004 The Apache Software Foundation.
 
4
 * Copyright 1999-2005 The Apache Software Foundation.
7
5
 * 
8
6
 * Licensed under the Apache License, Version 2.0 (the "License");
9
7
 * you may not use this file except in compliance with the License.
52
50
 * a template. The tag's body content consists of <tiles:put>
53
51
 * tags, which are accessed by <tiles:get> in the template.
54
52
 *
55
 
 * @version $Revision: 1.26 $ $Date: 2004/03/14 06:23:49 $
 
53
 * @version $Rev: 165160 $ $Date: 2005-04-28 17:29:58 +0100 (Thu, 28 Apr 2005) $
56
54
 */
57
55
public class InsertTag
58
56
        extends DefinitionTagSupport
422
420
         * Handlers also contain sub-component context.
423
421
         */
424
422
        public int doStartTag() throws JspException {
 
423
 
 
424
            // Additional fix for Bug 20034 (2005-04-28)
 
425
            cachedCurrentContext = null;
 
426
 
425
427
                // Check role immediatly to avoid useless stuff.
426
428
                // In case of insertion of a "definition", definition's role still checked later.
427
429
                // This lead to a double check of "role" ;-(