Author: ssegu
Date: Fri Dec 22 14:06:17 2006
New Revision: 489777
URL: http://svn.apache.org/viewvc?view=rev&rev=489777
Log:
Check for null to handle the current thread's Context ClassLoader being null
Modified:
incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/MultiClassLoader.java
Modified:
incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/MultiClassLoader.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/MultiClassLoader.java?view=diff&rev=489777&r1=489776&r2=489777
==============================================================================
---
incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/MultiClassLoader.java
(original)
+++
incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/MultiClassLoader.java
Fri Dec 22 14:06:17 2006
@@ -215,6 +215,9 @@
if (loader == THREAD_LOADER)
loader = Thread.currentThread().getContextClassLoader();
+ if (loader == null) // skip
+ continue;
+
rsrc = loader.getResource(name);
if (rsrc != null)
return rsrc;