Author: markt
Date: Sat Feb 16 22:25:59 2013
New Revision: 1446965
URL: http://svn.apache.org/r1446965
Log:
literal is never set so is always false
Modified:
tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java?rev=1446965&r1=1446964&r2=1446965&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java Sat
Feb 16 22:25:59 2013
@@ -57,7 +57,6 @@ public class XMLEncodingDetector {
private int fBufferSize = DEFAULT_BUFFER_SIZE;
// org.apache.xerces.impl.XMLEntityManager.ScannedEntity fields
- private boolean literal;
private char[] ch = new char[DEFAULT_BUFFER_SIZE];
private int position;
private int count;
@@ -608,9 +607,7 @@ public class XMLEncodingDetector {
// scan literal value
while (fCurrentEntity.position < fCurrentEntity.count) {
c = fCurrentEntity.ch[fCurrentEntity.position++];
- if ((c == quote &&
- (!fCurrentEntity.literal || external))
- || c == '%' || !XMLChar.isContent(c)) {
+ if (c == quote || c == '%' || !XMLChar.isContent(c)) {
fCurrentEntity.position--;
break;
}
@@ -621,12 +618,6 @@ public class XMLEncodingDetector {
// return next character
if (fCurrentEntity.position != fCurrentEntity.count) {
c = fCurrentEntity.ch[fCurrentEntity.position];
- // NOTE: We don't want to accidentally signal the
- // end of the literal if we're expanding an
- // entity appearing in the literal. -Ac
- if (c == quote && fCurrentEntity.literal) {
- c = -1;
- }
}
else {
c = -1;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
