Index: modules/beans/src/main/java/org/apache/harmony/beans/DefaultPersistenceDelegatesFactory.java =================================================================== --- modules/beans/src/main/java/org/apache/harmony/beans/DefaultPersistenceDelegatesFactory.java (revision 438050) +++ modules/beans/src/main/java/org/apache/harmony/beans/DefaultPersistenceDelegatesFactory.java (working copy) @@ -35,6 +35,9 @@ private static HashMap persistenceDelegates = new HashMap(); private static PersistenceDelegate createPersistenceDelegate(Class type) { + if (type == null) + return new NullPersistenceDelegate(); + PersistenceDelegate pd = null; try { String className = createDefaultNameForPersistenceDelegateClass(type); @@ -61,11 +64,11 @@ } public static PersistenceDelegate getPersistenceDelegate(Class type) { - String className = type.getName(); + String className = (type == null)?null:type.getName(); PersistenceDelegate result = persistenceDelegates.get(className); if (result == null) { - if (type.isArray()) { + if (type != null && type.isArray()) { result = org.apache.harmony.beans.ArrayPersistenceDelegate .getInstance(); } else {