Index: src/java/org/jpox/JDOClassLoaderResolver.java
===================================================================
RCS file: /cvsroot/jpox/JPOX/Core/src/java/org/jpox/JDOClassLoaderResolver.java,v
retrieving revision 1.18
diff -u -r1.18 JDOClassLoaderResolver.java
--- src/java/org/jpox/JDOClassLoaderResolver.java	17 Mar 2006 16:38:55 -0000	1.18
+++ src/java/org/jpox/JDOClassLoaderResolver.java	30 Mar 2006 13:57:33 -0000
@@ -163,6 +163,11 @@
             cls = classOrNull(name, registeredLoader);
         }
 
+        if (cls == null)
+        {
+            cls = classOrNull(name, getClass().getClassLoader());
+        }
+
         if( cls == null )
         {
             String msg = LOCALISER.msg("ClassLoader.ClassNotFound", name);
@@ -254,6 +259,11 @@
             cls = ClassOrNullWithInitialize(name, registeredLoader);
         }
 
+        if (cls == null)
+        {
+            cls = ClassOrNullWithInitialize(name, getClass().getClassLoader());
+        }
+
         if( cls == null )
         {
             String msg = LOCALISER.msg("ClassLoader.ClassNotFound", name);

