Re: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser XMLEncodingDetector.java

2004-10-01 Thread Jan Luehe 
Remy Maucherat wrote:
Remy Maucherat wrote:
Is it a standalone class or something like this ? If it is -> copy 
paste into the Jasper code and remove the funky loading logic.

(I thought JDK 1.5 was supposed to include the same Xerces 2 we were 
using - what happened ?) 

Follow up: the Xerces packages got renamed to 
com.sun.org.apache.xerces.internal.*.

So we have two options, one which I like and one which I don't like:
a) Write a XercesJava5EncodingDetector class with the right classnames
b) As the 5 classes used by the XercesEncodingDetector are self 
contained, we could copy them to the o.a.jasper.xmlparser package, so 
that Jasper can be spec compliant even without Xerces installed, merge 
the content of XercesEncodingDetector into XMLEncodingDetector, and 
remove the dynamic loading of Xerces

Since I think it's not acceptable to require Xerces to be compliant, I 
would choose b).
Agreed. Will make these changes.
Jan
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser XMLEncodingDetector.java

2004-10-01 Thread Remy Maucherat 
Remy Maucherat wrote:
Is it a standalone class or something like this ? If it is -> copy 
paste into the Jasper code and remove the funky loading logic.

(I thought JDK 1.5 was supposed to include the same Xerces 2 we were 
using - what happened ?) 
Follow up: the Xerces packages got renamed to 
com.sun.org.apache.xerces.internal.*.

So we have two options, one which I like and one which I don't like:
a) Write a XercesJava5EncodingDetector class with the right classnames
b) As the 5 classes used by the XercesEncodingDetector are self 
contained, we could copy them to the o.a.jasper.xmlparser package, so 
that Jasper can be spec compliant even without Xerces installed, merge 
the content of XercesEncodingDetector into XMLEncodingDetector, and 
remove the dynamic loading of Xerces

Since I think it's not acceptable to require Xerces to be compliant, I 
would choose b).

Rémy
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser XMLEncodingDetector.java

2004-09-30 Thread Remy Maucherat 
Jan Luehe wrote:
Remy Maucherat wrote:
[EMAIL PROTECTED] wrote:
We don't bundle Xerces anymore with the binaries, as Java 5 is 
supposed to be used. With JRE 1.4, the compat package must be added 
(it adds JMX and Xerces as endorsed).
I think this would explain the problem.

Yes, it does. I yet have to find XML prolog parsing and encoding
autodetection support in JDK 1.5 (the equivalent of what Xerces used to
provide). 
Is it a standalone class or something like this ? If it is -> copy paste 
into the Jasper code and remove the funky loading logic.

(I thought JDK 1.5 was supposed to include the same Xerces 2 we were 
using - what happened ?)

Rémy
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser XMLEncodingDetector.java

2004-09-30 Thread Jan Luehe 
Remy Maucherat wrote:
[EMAIL PROTECTED] wrote:
luehe   2004/09/30 14:57:09
 Modified:jasper2/src/share/org/apache/jasper/xmlparser
   XMLEncodingDetector.java
 Log:
 Log warning when XML prolog cannot be parsed.
 
 The 2 JSP TCK failures reported by Jeanfrancois are due to this, with
 this root cause:
 
   java.lang.ClassNotFoundException: org.apache.xerces.util.SymbolTable
 

We don't bundle Xerces anymore with the binaries, as Java 5 is supposed 
to be used. With JRE 1.4, the compat package must be added (it adds JMX 
and Xerces as endorsed).
I think this would explain the problem.
Yes, it does. I yet have to find XML prolog parsing and encoding
autodetection support in JDK 1.5 (the equivalent of what Xerces used to
provide).
Jan

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser XMLEncodingDetector.java

2004-09-30 Thread Remy Maucherat 
[EMAIL PROTECTED] wrote:
luehe   2004/09/30 14:57:09
 Modified:jasper2/src/share/org/apache/jasper/xmlparser
   XMLEncodingDetector.java
 Log:
 Log warning when XML prolog cannot be parsed.
 
 The 2 JSP TCK failures reported by Jeanfrancois are due to this, with
 this root cause:
 
   java.lang.ClassNotFoundException: org.apache.xerces.util.SymbolTable
 

We don't bundle Xerces anymore with the binaries, as Java 5 is supposed 
to be used. With JRE 1.4, the compat package must be added (it adds JMX 
and Xerces as endorsed).
I think this would explain the problem.

Rémy
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser XMLEncodingDetector.java

2004-09-30 Thread luehe 
luehe   2004/09/30 15:03:57

  Modified:jasper2/src/share/org/apache/jasper/xmlparser
XMLEncodingDetector.java
  Log:
  Fixed formating
  
  Revision  ChangesPath
  1.9   +2 -1  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser/XMLEncodingDetector.java
  
  Index: XMLEncodingDetector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser/XMLEncodingDetector.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- XMLEncodingDetector.java  30 Sep 2004 21:57:09 -  1.8
  +++ XMLEncodingDetector.java  30 Sep 2004 22:03:57 -  1.9
  @@ -56,7 +56,8 @@
   Class 
detectorClass=Class.forName("org.apache.jasper.xmlparser.XercesEncodingDetector");
   detector = (XMLEncodingDetector) detectorClass.newInstance();
   } catch (Exception ex) {
  -log.warn("Unable to parse XML prolog: Defaulting encoding to UTF8 ", 
ex);
  +log.warn("Unable to parse XML prolog: Defaulting encoding to UTF8",
  + ex);
   detector = new XMLEncodingDetector();
   }
   return detector.getEncodingMethod(fname, jarFile, ctxt, err);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser XMLEncodingDetector.java

2004-09-30 Thread luehe 
luehe   2004/09/30 14:57:09

  Modified:jasper2/src/share/org/apache/jasper/xmlparser
XMLEncodingDetector.java
  Log:
  Log warning when XML prolog cannot be parsed.
  
  The 2 JSP TCK failures reported by Jeanfrancois are due to this, with
  this root cause:
  
java.lang.ClassNotFoundException: org.apache.xerces.util.SymbolTable
  
  Revision  ChangesPath
  1.8   +6 -1  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser/XMLEncodingDetector.java
  
  Index: XMLEncodingDetector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser/XMLEncodingDetector.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- XMLEncodingDetector.java  17 Mar 2004 19:23:05 -  1.7
  +++ XMLEncodingDetector.java  30 Sep 2004 21:57:09 -  1.8
  @@ -23,9 +23,13 @@
   import org.apache.jasper.JspCompilationContext;
   import org.apache.jasper.compiler.ErrorDispatcher;
   
  +import org.apache.commons.logging.Log;
  +import org.apache.commons.logging.LogFactory;
   
   public class XMLEncodingDetector {
   
  +private static Log log = LogFactory.getLog(XMLEncodingDetector.class);
  +
   /**
* Autodetects the encoding of the XML document supplied by the given
* input stream.
  @@ -51,7 +55,8 @@
   Class.forName("org.apache.xerces.util.SymbolTable");
   Class 
detectorClass=Class.forName("org.apache.jasper.xmlparser.XercesEncodingDetector");
   detector = (XMLEncodingDetector) detectorClass.newInstance();
  -} catch(Exception ex ) {
  +} catch (Exception ex) {
  +log.warn("Unable to parse XML prolog: Defaulting encoding to UTF8 ", 
ex);
   detector = new XMLEncodingDetector();
   }
   return detector.getEncodingMethod(fname, jarFile, ctxt, err);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser XMLEncodingDetector.java XercesEncodingDetector.java

2004-02-05 Thread markt 
markt   2004/02/05 14:16:47

  Modified:jasper2/src/share/org/apache/jasper
JspCompilationContext.java Options.java
   jasper2/src/share/org/apache/jasper/compiler
ErrorHandler.java JspRuntimeContext.java
SmapStratum.java
   jasper2/src/share/org/apache/jasper/compiler/tagplugin
TagPluginContext.java
   jasper2/src/share/org/apache/jasper/runtime
JspRuntimeLibrary.java
   jasper2/src/share/org/apache/jasper/servlet
JasperLoader.java
   jasper2/src/share/org/apache/jasper/xmlparser
XMLEncodingDetector.java
XercesEncodingDetector.java
  Log:
  - Fix bugs 13960, 13961. Edit javadoc comments to prevent warnings during compile. A 
minor issue but enables a couple of bugs to be closed.
  - Reported against TC4 but equally relevant here.
  - Reported by David Medinets.
  
  Revision  ChangesPath
  1.44  +5 -4  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java
  
  Index: JspCompilationContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- JspCompilationContext.java8 Oct 2003 17:39:15 -   1.43
  +++ JspCompilationContext.java5 Feb 2004 22:16:46 -   1.44
  @@ -374,8 +374,9 @@
   }
   
   /**
  - * True if we are compiling a tag file in prototype mode, i.e. we only
  - * Generate codes with class for the tag handler with empty method bodies.
  + * True if we are compiling a tag file in prototype mode.
  + * ie we only generate codes with class for the tag handler with empty
  + * method bodies.
*/
   public boolean isPrototypeMode() {
   return protoTypeMode;
  
  
  
  1.20  +4 -4  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Options.java
  
  Index: Options.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Options.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Options.java  10 Nov 2003 22:26:20 -  1.19
  +++ Options.java  5 Feb 2004 22:16:47 -   1.20
  @@ -122,7 +122,7 @@
   public boolean isSmapSuppressed();
   
   /**
  - * Should SMAP info for JSR45 debugging be dumped to a file?
  + * Indicates that SMAP info for JSR45 debugging should be dumped to a file.
* Ignored is suppressSmap() is true
*/
   public boolean isSmapDumped();
  
  
  
  1.3   +5 -5  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorHandler.java
  
  Index: ErrorHandler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ErrorHandler.java 7 Oct 2002 19:37:21 -   1.2
  +++ ErrorHandler.java 5 Feb 2004 22:16:47 -   1.3
  @@ -81,7 +81,7 @@
* @param fname Name of the JSP file in which the parse error occurred
* @param line Parse error line number
* @param column Parse error column number
  - * @param errMsg Parse error message
  + * @param msg Parse error message
* @param exception Parse exception
*/
   public void jspError(String fname, int line, int column, String msg,
  @@ -90,7 +90,7 @@
   /**
* Processes the given JSP parse error.
*
  - * @param errMsg Parse error message
  + * @param msg Parse error message
* @param exception Parse exception
*/
   public void jspError(String msg, Exception exception)
  
  
  
  1.18  +10 -10
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java
  
  Index: JspRuntimeContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- JspRuntimeContext.java28 Oct 2003 19:18:53 -  1.17
  +++ JspRuntimeContext.java5 Feb 2004 22:16:47 -   1.18
  @@ -89,7 +89,7 @@
   
   /**
* Class for tracking JSP compile time file dependencies when the
  - * <[EMAIL PROTECTED] file="..."%> directive is used.
  + * &060;[EMAIL PROTECTED] file="..."%&062; directive is used.
*
* A background thread periodically checks the files a JSP page
* is dependent upon.

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser XMLEncodingDetector.java XercesEncodingDetector.java

2003-02-12 Thread luehe 
luehe   2003/02/12 15:44:24

  Modified:jasper2/src/share/org/apache/jasper/compiler Compiler.java
PageInfo.java ParserController.java Validator.java
   jasper2/src/share/org/apache/jasper/xmlparser
XMLEncodingDetector.java
XercesEncodingDetector.java
  Log:
  Last round of encoding-determination changes, to comply with the spec.
  
  Revision  ChangesPath
  1.52  +1 -1  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java
  
  Index: Compiler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- Compiler.java 12 Feb 2003 02:22:51 -  1.51
  +++ Compiler.java 12 Feb 2003 23:44:22 -  1.52
  @@ -210,7 +210,7 @@
pageInfo.setELIgnoredSpecified(true);
}
pageInfo.setIsXml(JspUtil.booleanValue(jspProperty.isXml()));
  - pageInfo.setPageEncoding(jspProperty.getPageEncoding());
  + pageInfo.setConfigEncoding(jspProperty.getPageEncoding());
pageInfo.setELIgnored(JspUtil.booleanValue(jspProperty.isELIgnored()));

pageInfo.setScriptingInvalid(JspUtil.booleanValue(jspProperty.isScriptingInvalid()));
if (jspProperty.getIncludePrelude() != null) {
  
  
  
  1.19  +30 -3 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageInfo.java
  
  Index: PageInfo.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageInfo.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- PageInfo.java 12 Feb 2003 02:22:51 -  1.18
  +++ PageInfo.java 12 Feb 2003 23:44:22 -  1.19
  @@ -89,6 +89,17 @@
   private String errorPage = null;
   private String pageEncoding = null;
   
  +// Encoding specified in JSP config element
  +private String configEncoding;
  +
  +/*
  + * Indicates whether an encoding has been explicitly specified in the
  + * page's XML prolog (only used for pages in XML syntax).
  + * This information is used to decide whether a translation error must
  + * be reported for encoding conflicts.
  + */
  +private boolean isEncodingSpecifiedInProlog;
  +
   private int maxTagNesting = 0;
   private boolean scriptless = false;
   private boolean scriptingInvalid = false;
  @@ -228,6 +239,22 @@
   
   public String getPageEncoding() {
return pageEncoding;
  +}
  +
  +public void setIsEncodingSpecifiedInProlog(boolean isSpecified) {
  + this.isEncodingSpecifiedInProlog = isSpecified;
  +}
  +
  +public boolean isEncodingSpecifiedInProlog() {
  + return this.isEncodingSpecifiedInProlog;
  +}
  +
  +public void setConfigEncoding(String enc) {
  + this.configEncoding = enc;
  +}
  +
  +public String getConfigEncoding() {
  + return this.configEncoding;
   }
   
   public int getMaxTagNesting() {
  
  
  
  1.32  +35 -27
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ParserController.java
  
  Index: ParserController.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ParserController.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- ParserController.java 27 Jan 2003 23:15:33 -  1.31
  +++ ParserController.java 12 Feb 2003 23:44:23 -  1.32
  @@ -199,27 +199,23 @@
figureOutJspDocument(absFileName, jarFile);
   
if (isTopFile) {
  - if (isXml) {
  - // Make sure the encoding determined from the XML prolog
  - // matches that in the JSP config element, if present.
  - // Treat "UTF-16", "UTF-16BE", and "UTF-16LE" as identical.
  - String jspConfigPageEnc = pageInfo.getPageEncoding();
  + if (isXml && pageInfo.isEncodingSpecifiedInProlog()) {
  + /*
  +  * Make sure the encoding explicitly specified in the XML
  +  * prolog (if any) matches that in the JSP config element
  +  * (if any), treating "UTF-16", "UTF-16BE", and "UTF-16LE" as
  +  * identical.
  +  */
  + String jspConfigPageEnc = pageInfo.getConfigEncoding();
if (jspConfigPageEnc != null
&& !jspConfigPageEnc.equals(sourceEnc)
  - && (!jspConfigPageEnc.startsWith("UTF-16")
  + && (!jspConfigPageEnc.startsWith("UTF-16")
|| !sourceEnc.startsWith("UTF-16"))) {

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser XMLEncodingDetector.java XercesEncodingDetector.java

2003-01-27 Thread luehe 
luehe   2003/01/27 10:10:48

  Modified:jasper2/src/share/org/apache/jasper/compiler PageInfo.java
ParserController.java Validator.java
   jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
   jasper2/src/share/org/apache/jasper/xmlparser
XMLEncodingDetector.java
XercesEncodingDetector.java
  Log:
  Fixed 16127 ("Seems to be a problem doing a static include of content
  when using a different charset.")
  
  In addition, the presence of an XML prolog no longer implies a JSP
  document, as it may actually be used with standard syntax to produce
  an XML-formatted result (in which case Jasper must treat the XML
  prolog as template text).
  
  Revision  ChangesPath
  1.17  +3 -18 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageInfo.java
  
  Index: PageInfo.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageInfo.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- PageInfo.java 8 Nov 2002 19:55:47 -   1.16
  +++ PageInfo.java 27 Jan 2003 18:10:47 -  1.17
  @@ -89,13 +89,6 @@
   private String errorPage = null;
   private String pageEncoding = null;
   
  -/*
  - * Auto-detected encoding, or encoding specified in XML prolog
  - * (declaration).
  - * Only meaningful for XML documents.
  - */
  -private String xmlPrologEncoding = null;
  -
   private int maxTagNesting = 0;
   private boolean scriptless = false;
   private boolean scriptingInvalid = false;
  @@ -233,14 +226,6 @@
return pageEncoding;
   }
   
  -public void setXmlPrologEncoding(String xmlPrologEncoding) {
  - this.xmlPrologEncoding = xmlPrologEncoding;
  -}
  -
  -public String getXmlPrologEncoding() {
  - return xmlPrologEncoding;
  -}
  -
   public int getMaxTagNesting() {
   return maxTagNesting;
   }
  
  
  
  1.30  +97 -54
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ParserController.java
  
  Index: ParserController.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ParserController.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- ParserController.java 22 Jan 2003 20:08:24 -  1.29
  +++ ParserController.java 27 Jan 2003 18:10:47 -  1.30
  @@ -67,12 +67,10 @@
   /**
* Controller for the parsing of a JSP page.
* 
  - * A translation unit (JSP source file and any files included via the
  - * include directive) may involve the processing of JSP pages
  - * written with different syntaxes (currently the original JSP syntax,
  - * as well as the XML syntax (as of JSP 1.2)). This class encapsulates 
  - * the behavior related to the selection and invocation of 
  - * the proper parser.
  + * The same ParserController instance is used for a JSP page and any JSP
  + * segments included by it (via an include directive), where each segment may
  + * be provided in standard or XML syntax. This class selects and invokes the
  + * appropriate parser for the JSP page and its included segments.
*
* @author Pierre Delisle
* @author Jan Luehe
  @@ -110,6 +108,8 @@
*/
   private boolean isTopFile = true;
   
  +private String sourceEnc;
  +
   /*
* Constructor
*/
  @@ -196,9 +196,27 @@
   
// Figure out what type of JSP document and encoding type we are
// dealing with
  - String encoding = figureOutJspDocument(absFileName, jarFile);
  + figureOutJspDocument(absFileName, jarFile);
   
if (isTopFile) {
  + if (isXml) {
  + // Make sure the encoding determined from the XML prolog
  + // matches that in the JSP config element, if present
  + String jspConfigPageEnc = pageInfo.getPageEncoding();
  + if (jspConfigPageEnc != null
  + && !jspConfigPageEnc.equals(sourceEnc)) {
  + err.jspError("jsp.error.prolog_config_encoding_mismatch",
  +  sourceEnc, jspConfigPageEnc);
  + }
  + // override the encoding that may have been set from JSP config
  + // info (in Compiler.generateJava()), since that applies to
  + // standard syntax only
  + pageInfo.setPageEncoding(sourceEnc);
  + } else {
  + if (pageInfo.getPageEncoding() == null) {
  + pageInfo.setPageEncoding(sourceEnc);
  + }
  + }
pag

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser XMLEncodingDetector.java

2002-11-07 Thread remm 
remm2002/11/07 07:23:43

  Modified:jasper2/src/share/org/apache/jasper/xmlparser
XMLEncodingDetector.java
  Log:
  - This appreas to fix the stack overflow.
  
  Revision  ChangesPath
  1.2   +1 -1  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser/XMLEncodingDetector.java
  
  Index: XMLEncodingDetector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser/XMLEncodingDetector.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLEncodingDetector.java  6 Nov 2002 20:14:20 -   1.1
  +++ XMLEncodingDetector.java  7 Nov 2002 15:23:43 -   1.2
  @@ -1062,7 +1062,7 @@
}
// handle the trailing edges
if (fCurrentEntity.position == fCurrentEntity.count) {
  - load(0, true);
  + load(0, false);
}
}
}
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: