[patch] Patch for Mark.java

Mark.diff (text/plain), 1.85 KB, created by Sheldon Shao on 2012-08-17 14:30:23 UTC

(hide)

Description: Patch for Mark.java

Filename:

MIME Type:

Creator: Sheldon Shao

Created: 2012-08-17 14:30:23 UTC

Size: 1.85 KB

patch

obsolete

>Index: org/apache/jasper/compiler/Mark.java >=================================================================== >--- org/apache/jasper/compiler/Mark.java (revision 1370136) >+++ org/apache/jasper/compiler/Mark.java (working copy) >@@ -89,22 +89,39 @@ > * Constructor > */ > Mark(Mark other) { >+ init(other, false); >+ } > >- this.reader = other.reader; >- this.ctxt = other.reader.getJspCompilationContext(); >- this.stream = other.stream; >- this.fileId = other.fileId; >- this.fileName = other.fileName; >+ void update(int cursor, int line, int col) { >+ this.cursor = cursor; >+ this.line = line; >+ this.col = col; >+ } >+ >+ void init(Mark other, boolean singleFile) { > this.cursor = other.cursor; > this.line = other.line; > this.col = other.col; >- this.baseDir = other.baseDir; >- this.encoding = other.encoding; >- >- // clone includeStack without cloning contents >- includeStack = new Stack<IncludeState>(); >- for ( int i=0; i < other.includeStack.size(); i++ ) { >- includeStack.addElement( other.includeStack.elementAt(i) ); >+ if (!singleFile) { >+ this.reader = other.reader; >+ this.ctxt = other.ctxt; >+ this.stream = other.stream; >+ this.fileId = other.fileId; >+ this.fileName = other.fileName; >+ >+ this.baseDir = other.baseDir; >+ this.encoding = other.encoding; >+ >+ // clone includeStack without cloning contents >+ if (includeStack != null) { >+ includeStack.clear(); >+ } >+ else { >+ includeStack = new Stack<IncludeState>(); >+ } >+ for ( int i=0; i < other.includeStack.size(); i++ ) { >+ includeStack.addElement( other.includeStack.elementAt(i) ); >+ } > } > } > 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]