[jboss-cvs] JBossAS SVN: r83667 - projects/ejb3/trunk/core/src/main/java/org/jboss/injection/lang/reflect.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2009-01-30 05:43:38 -0500 (Fri, 30 Jan 2009)
New Revision: 83667

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/injection/lang/reflect/FieldBeanProperty.java
Log:
[EJBTHREE-1694] Avoid NPE in the case of bootstrap CL comparison

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/injection/lang/reflect/FieldBeanProperty.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/injection/lang/reflect/FieldBeanProperty.java	2009-01-30 10:39:17 UTC (rev 83666)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/injection/lang/reflect/FieldBeanProperty.java	2009-01-30 10:43:38 UTC (rev 83667)
@@ -86,7 +86,8 @@
          // value and target field CLs are not equal
          ClassLoader fieldLoader = field.getType().getClassLoader();
          ClassLoader valueLoader = value.getClass().getClassLoader();
-         boolean equalLoaders = fieldLoader.equals(valueLoader);
+         // Equal if both are null (some JDKs use this to represent Bootstrap CL), or they're equal - EJBTHREE-1694
+         boolean equalLoaders = (fieldLoader==null && valueLoader==null) ? true : fieldLoader.equals(valueLoader);
          if (!equalLoaders)
          {
             log.error("Field Classloader: " + fieldLoader + "\nValue ClassLoader: " + valueLoader + "\nEqual Loaders: "