Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Received-SPF: neutral (nike.apache.org: local policy)
Message-ID: <482D8733.1080802@apache.org>
Date: Fri, 16 May 2008 14:08:03 +0100
From: Mark Thomas <markt@apache.org>
User-Agent: Thunderbird 2.0.0.14 (Windows/20080421)
MIME-Version: 1.0
To: Tomcat Developers List <dev@tomcat.apache.org>
Subject: Re: svn commit: r656839 - in /tomcat/tc6.0.x/trunk: STATUS.txt
 java/org/apache/jasper/compiler/Validator.java
 webapps/docs/changelog.xml
References: <20080515210847.AB0732388A12@eris.apache.org>
 <482D7F82.6020806@list-post.mks-mail.de>
In-Reply-To: <482D7F82.6020806@list-post.mks-mail.de>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit

Markus Schönhaber wrote:
> markt@apache.org wrote:
> 
>> Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
>> URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java?rev=656839&r1=656838&r2=656839&view=diff
>> ==============================================================================
>> --- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java (original)
>> +++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java Thu May 15 14:08:47 2008
>> @@ -323,11 +323,12 @@
>>           * 
>>           * @throws JasperException in case of page encoding mismatch
>>           */
>> -        private String comparePageEncodings(String pageDirEnc,
>> +        private String comparePageEncodings(String thePageDirEnc,
>>                  Node.PageDirective pageDir) throws JasperException {
>>  
>>              Node.Root root = pageDir.getRoot();
>> -            String configEnc = root.getJspConfigPageEncoding();
>> +            String configEnc = root.getJspConfigPageEncoding().toUpperCase();
>> +            String pageDirEnc = thePageDirEnc.toUpperCase();
>>  
>>              /*
>>               * Compare the 'pageEncoding' attribute of the page directive with
>> @@ -355,7 +356,7 @@
>>               * identical.
>>               */
>>              if ((root.isXmlSyntax() && root.isEncodingSpecifiedInProlog()) || root.isBomPresent()) {
>> -                String pageEnc = root.getPageEncoding();
>> +                String pageEnc = root.getPageEncoding().toUpperCase();
>>                  if (!pageDirEnc.equals(pageEnc)
>>                          && (!pageDirEnc.startsWith("UTF-16") || !pageEnc
>>                                  .startsWith("UTF-16"))) {
> 
> While a build yesterday - without this change - works fine, a build with
> the above patch applied fails to compile JSPs for me:
> 
>> java.lang.NullPointerException
>> 	at org.apache.jasper.compiler.Validator$DirectiveVisitor.comparePageEncodings(Validator.java:330)

Yep, my bad. I'll take a look over the weekend. Fix should be simple.

Mark


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org