Fix NPE reported on the dev list. The other toUpperCase() calls should be safe since...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@657149 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/jasper/compiler/Validator.java b/java/org/apache/jasper/compiler/Validator.java
index e97b02d..cbc9fd6 100644 (file)
--- a/java/org/apache/jasper/compiler/Validator.java
+++ b/java/org/apache/jasper/compiler/Validator.java
@@ -326,7 +326,7 @@ class Validator {
                 Node.PageDirective pageDir) throws JasperException {
 
             Node.Root root = pageDir.getRoot();
-            String configEnc = root.getJspConfigPageEncoding().toUpperCase();
+            String configEnc = root.getJspConfigPageEncoding();
             String pageDirEnc = thePageDirEnc.toUpperCase();
 
             /*
@@ -336,6 +336,7 @@ class Validator {
              * "UTF-16LE" as identical.
              */
             if (configEnc != null) {
+                configEnc = configEnc.toUpperCase();
                 if (!pageDirEnc.equals(configEnc)
                         && (!pageDirEnc.startsWith("UTF-16") || !configEnc
                                 .startsWith("UTF-16"))) {