Author: jfclere
Date: Thu Mar 16 03:54:29 2006
New Revision: 386315
URL: http://svn.apache.org/viewcvs?rev=386315&view=rev
Log:
If the encoding is not specified use the detected one.
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ParserController.java
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ParserController.java
URL:
http://svn.apache.org/viewcvs/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ParserController.java?rev=386315&r1=386314&r2=386315&view=diff
==============================================================================
---
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ParserController.java
(original)
+++
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ParserController.java
Thu Mar 16 03:54:29 2006
@@ -372,7 +372,8 @@
* Determine the page encoding from the page directive, unless it's
* specified via JSP config.
*/
- sourceEnc = jspConfigPageEnc;
+ if (jspConfigPageEnc != null)
+ sourceEnc = jspConfigPageEnc;
if (sourceEnc == null) {
sourceEnc = getPageEncodingForJspSyntax(jspReader, startMark);
if (sourceEnc == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
