Author: remm
Date: Fri May 2 08:59:56 2008
New Revision: 652796
URL: http://svn.apache.org/viewvc?rev=652796&view=rev
Log:
- Propose EL NPE fix.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=652796&r1=652795&r2=652796&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri May 2 08:59:56 2008
@@ -100,3 +100,16 @@
http://svn.apache.org/viewvc?rev=652669&view=rev
+1: markt
-1:
+
+* Possible NPE in EL (one liner regression fix in org.apache.el.lang.ELSupport)
+@@ -343,7 +343,7 @@
+ public final static Object coerceToType(final Object obj, final Class
type)
+ throws IllegalArgumentException {
+ if (type == null || Object.class.equals(type) ||
+- type.equals(obj.getClass())) {
++ (obj != null && type.equals(obj.getClass()))) {
+ return obj;
+ }
+ if (String.class.equals(type)) {
+ +1: remm
+ -1:
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
