Author: remy.maucherat(a)jboss.com
Date: 2014-03-24 05:19:51 -0400 (Mon, 24 Mar 2014)
New Revision: 2397
Modified:
branches/2.1.x/java/javax/el/BeanELResolver.java
Log:
JBWEB-293: Add submitted patch for NPE.
Modified: branches/2.1.x/java/javax/el/BeanELResolver.java
===================================================================
--- branches/2.1.x/java/javax/el/BeanELResolver.java 2014-03-21 14:35:49 UTC (rev 2396)
+++ branches/2.1.x/java/javax/el/BeanELResolver.java 2014-03-24 09:19:51 UTC (rev 2397)
@@ -344,7 +344,8 @@
while (iter.hasNext()) {
Class<?> key = iter.next();
BeanProperties bp = cache.get(key);
- if(bp.getType().getClassLoader().equals(classloader)){
+ if (bp.getType().getClassLoader() != null &&
bp.getType().getClassLoader().equals(classloader)){
+ // JBWEB-293, avoid NPE if key's name is like java.lang.Class,
getClassLoader() returns null to represent the bootstrap class loader
iter.remove();
}
}
Show replies by date