From 7303bcd5d5fee247520eb5d105f5b4a5ab7776f7 Mon Sep 17 00:00:00 2001 From: "Kevin W. Sutter" Date: Tue, 27 Feb 2007 18:48:19 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@512357 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/openjpa/lib/conf/ObjectValue.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java index a9c0675d1..4c4bd9010 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java @@ -92,9 +92,10 @@ public class ObjectValue extends Value { 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); }