Index: beans/src/main/java/java/beans/PropertyEditorManager.java =================================================================== --- beans/src/main/java/java/beans/PropertyEditorManager.java (revision 392229) +++ beans/src/main/java/java/beans/PropertyEditorManager.java (working copy) @@ -66,10 +66,15 @@ if (editorClass == null) { String editorClassName = targetType.getName() + "Editor"; + ClassLoader loader = targetType.getClassLoader(); + if(loader == null) { + loader = Thread.currentThread().getContextClassLoader(); + } + try { editorClass = Class.forName( - editorClassName, true, targetType.getClassLoader()); + editorClassName, true, loader); } catch (ClassNotFoundException cnfe) { String shortEditorClassName = editorClassName.substring( editorClassName.lastIndexOf(".") + 1); @@ -85,7 +90,7 @@ try { editorClass = Class.forName(editorClassName, true, - targetType.getClassLoader()); + loader); } catch (ClassNotFoundException cnfe2) { } catch (Exception e) { break;