Author: remy.maucherat(a)jboss.com
Date: 2008-05-16 09:36:40 -0400 (Fri, 16 May 2008)
New Revision: 628
Modified:
trunk/java/org/apache/jasper/compiler/Validator.java
Log:
- Fix likely NPE.
Modified: trunk/java/org/apache/jasper/compiler/Validator.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/Validator.java 2008-05-16 13:22:14 UTC (rev
627)
+++ trunk/java/org/apache/jasper/compiler/Validator.java 2008-05-16 13:36:40 UTC (rev
628)
@@ -327,7 +327,7 @@
Node.PageDirective pageDir) throws JasperException {
Node.Root root = pageDir.getRoot();
- String configEnc = root.getJspConfigPageEncoding().toUpperCase();
+ String configEnc = root.getJspConfigPageEncoding();
String pageDirEnc = thePageDirEnc.toUpperCase();
/*
@@ -337,6 +337,7 @@
* "UTF-16LE" as identical.
*/
if (configEnc != null) {
+ configEnc = configEnc.toUpperCase();
if (!pageDirEnc.equals(configEnc)
&& (!pageDirEnc.startsWith("UTF-16") ||
!configEnc
.startsWith("UTF-16"))) {
Show replies by date