Author: markt
Date: Thu May 15 12:29:54 2008
New Revision: 656803
URL: http://svn.apache.org/viewvc?rev=656803&view=rev
Log:
Fix possible NPE spotted by Remy in a previous patch
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=656803&r1=656802&r2=656803&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 15 12:29:54 2008
@@ -51,19 +51,6 @@
+1: jfclere, rjung, fhanik, remm, pero
-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, markt, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43191
No way to turn off compression for some mime-types
Based on a patch by Len Popp
Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java?rev=656803&r1=656802&r2=656803&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java Thu May 15
12:29:54 2008
@@ -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)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
