[patch] Patch for jasper

bug-47318.patch (text/plain), 2.36 KB, created by Tim Funk on 2009-06-09 10:08:14 UTC

(hide)

Description: Patch for jasper

Filename:

MIME Type:

Creator: Tim Funk

Created: 2009-06-09 10:08:14 UTC

Size: 2.36 KB

patch

obsolete

>Index: java/org/apache/jasper/compiler/ParserController.java >=================================================================== >--- java/org/apache/jasper/compiler/ParserController.java (revision 783063) >+++ java/org/apache/jasper/compiler/ParserController.java (working copy) >@@ -22,8 +22,10 @@ > import java.io.InputStreamReader; > import java.net.JarURLConnection; > import java.net.URL; >+import java.util.jar.JarFile; >+import java.util.Iterator; >+import java.util.List; > import java.util.Stack; >-import java.util.jar.JarFile; > > import org.apache.jasper.JasperException; > import org.apache.jasper.JspCompilationContext; >@@ -122,6 +124,29 @@ > > > /** >+ * For includePrelude and coda >+ * >+ * @param files The paths of the resource to be included. >+ * @param nodes The parent node of the include directive. >+ */ >+ public Node.Nodes parseIncludeDirectives(List files, Node.Nodes nodes) >+ throws FileNotFoundException, JasperException, IOException { >+ isTagFile = ctxt.isTagFile(); >+ directiveOnly = true; >+ if (files != null) { >+ Iterator iter = files.iterator(); >+ while (iter.hasNext()) { >+ Node.Nodes directives = doParse((String) iter.next(), null, null); >+ for (int i=0;directives!=null&&i<directives.size();i++) { >+ nodes.add(directives.getNode(i)); >+ } >+ } >+ } >+ return nodes; >+ } >+ >+ >+ /** > * Processes an include directive with the given path. > * > * @param inFileName The path to the resource to be included. >Index: java/org/apache/jasper/compiler/Compiler.java >=================================================================== >--- java/org/apache/jasper/compiler/Compiler.java (revision 783063) >+++ java/org/apache/jasper/compiler/Compiler.java (working copy) >@@ -164,6 +164,13 @@ > // Pass 1 - the directives > Node.Nodes directives = > parserCtl.parseDirectives(ctxt.getJspFile()); >+ directives = >+ parserCtl.parseIncludeDirectives( >+ pageInfo.getIncludePrelude(), directives); >+ directives = >+ parserCtl.parseIncludeDirectives( >+ pageInfo.getIncludeCoda(), directives); >+ > Validator.validateDirectives(this, directives); > > // Pass 2 - the whole translation unit View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]