Author: kwsutter Date: Tue Feb 27 10:48:19 2007 New Revision: 512357 URL: http://svn.apache.org/viewvc?view=rev&rev=512357 Log: Slight update for the changes introduced via svn revision 506230 (OPENJPA-138). Instead of just skipping the "null ClassLoader" (which indicates the SystemClassLoader), we'll use the static ClassLoader.getSystemClassLoader() method in order to populate the cache.
This change will help the non-container-managed environment (whereas the original change only benefitted the container-managed environment). This was discussed on the dev mailing list between Patrick, Marc, and myself. Modified: incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java Modified: incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java?view=diff&rev=512357&r1=512356&r2=512357 ============================================================================== --- incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java (original) +++ incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java Tue Feb 27 10:48:19 2007 @@ -92,9 +92,10 @@ ClassLoader cl = (ClassLoader) _classloaderCache.get(type); if (cl == null) { cl = type.getClassLoader(); - if (cl != null) { // System classloader is returned as null - _classloaderCache.put(type, cl); + if (cl == null) { // System classloader is returned as null + cl = ClassLoader.getSystemClassLoader(); } + _classloaderCache.put(type, cl); } return Configurations.newInstance(clsName, this, conf, cl, fatal); }