--- 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) );
+	        }
         }
     }