Author: markt
Date: Tue Jul 31 19:22:56 2007
New Revision: 561623
URL: http://svn.apache.org/viewvc?view=rev&rev=561623
Log:
Fix bug 42922. Treat XML comments as comments in JSP documents
Modified:
tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
tomcat/jasper/branches/tc4.1.x/src/share/org/apache/jasper/compiler/JspDocumentParser.java
Modified: tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt?view=diff&rev=561623&r1=561622&r2=561623
==============================================================================
--- tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt (original)
+++ tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt Tue Jul 31 19:22:56
2007
@@ -2399,6 +2399,10 @@
<jsp:include> whose target performs a 'forward' does not behave as
expected
+[4.1.37] #42922
+ Generator
+ XML comments were treated as template text in JSP Documents
+
============================
KNOWN ISSUES IN THIS RELEASE:
Modified:
tomcat/jasper/branches/tc4.1.x/src/share/org/apache/jasper/compiler/JspDocumentParser.java
URL:
http://svn.apache.org/viewvc/tomcat/jasper/branches/tc4.1.x/src/share/org/apache/jasper/compiler/JspDocumentParser.java?view=diff&rev=561623&r1=561622&r2=561623
==============================================================================
---
tomcat/jasper/branches/tc4.1.x/src/share/org/apache/jasper/compiler/JspDocumentParser.java
(original)
+++
tomcat/jasper/branches/tc4.1.x/src/share/org/apache/jasper/compiler/JspDocumentParser.java
Tue Jul 31 19:22:56 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -266,7 +267,7 @@
if (!inDTD) {
Mark start = new Mark(path, locator.getLineNumber(),
locator.getColumnNumber());
- new Node.TemplateText(new String(buf, offset, len), start,
current);
+ new Node.Comment(new String(buf, offset, len), start, current);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
