Author: jfclere
Date: Sat Mar 18 01:23:48 2006
New Revision: 386829

URL: http://svn.apache.org/viewcvs?rev=386829&view=rev
Log:
Rollback commit... Searching for a better solution.

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=386829&r1=386828&r2=386829&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
 Sat Mar 18 01:23:48 2006
@@ -372,8 +372,7 @@
         * Determine the page encoding from the page directive, unless it's
         * specified via JSP config.
         */
-       if (jspConfigPageEnc != null)
-           sourceEnc = jspConfigPageEnc;
+       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]

Reply via email to