You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by lu...@apache.org on 2003/01/16 03:32:56 UTC
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser XercesEncodingDetector.java
luehe 2003/01/15 18:32:56
Modified: jasper2/src/share/org/apache/jasper/xmlparser
XercesEncodingDetector.java
Log:
Fixed 16129: A translation-time error is not raised when the value of the page directives pageEncoding attribute fails to match that of the xml prolog of the JSP document.
Revision Changes Path
1.2 +10 -12 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser/XercesEncodingDetector.java
Index: XercesEncodingDetector.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser/XercesEncodingDetector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesEncodingDetector.java 9 Jan 2003 17:43:15 -0000 1.1
+++ XercesEncodingDetector.java 16 Jan 2003 02:32:56 -0000 1.2
@@ -114,6 +114,14 @@
private String[] fStrings = new String[3];
private ErrorDispatcher err;
+
+ /**
+ * Constructor
+ */
+ public XercesEncodingDetector() {
+ fSymbolTable = new SymbolTable();
+ fCurrentEntity = this;
+ }
/**
* Autodetects the encoding of the XML document supplied by the given
@@ -145,8 +153,8 @@
}
public Object[] getEncodingMethod(String fname, JarFile jarFile,
- JspCompilationContext ctxt,
- ErrorDispatcher err)
+ JspCompilationContext ctxt,
+ ErrorDispatcher err)
throws IOException, JasperException
{
InputStream inStream = JspUtil.getInputStream(fname, jarFile,
@@ -155,16 +163,6 @@
inStream.close();
return ret;
- }
-
- /**
- * Constructor.
- */
- public XercesEncodingDetector(InputStream stream, ErrorDispatcher err) {
- this.stream = stream;
- this.err = err;
- fSymbolTable = new SymbolTable();
- fCurrentEntity = this;
}
// stub method
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>