Author: markt
Date: Tue May 20 15:33:19 2008
New Revision: 658466
URL: http://svn.apache.org/viewvc?rev=658466&view=rev
Log:
Fix NPE in patch for bug 44986
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=658466&r1=658465&r2=658466&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue May 20 15:33:19 2008
@@ -44,11 +44,6 @@
+1: jfclere, rjung, fhanik, remm, pero
-1:
-* Fix NPE in patch for bug 44986
- http://svn.apache.org/viewvc?rev=657149&view=rev
- +1: markt, remm, yoavs
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45015
You can't use an unescaped quote if you quote the value with that character
http://svn.apache.org/viewvc?rev=657231&view=rev
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=658466&r1=658465&r2=658466&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 Tue May
20 15:33:19 2008
@@ -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"))) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
