Spring/spring-data-mongodb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed potential NullPointer.

Browse Source
This commit is contained in:
Oliver Gierke
2011-03-24 15:50:18 +01:00
parent 7ec8b30fb2
commit 986203833a
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MappingMongoConverter.java
View File

@@ -569,11 +569,12 @@ public class MappingMongoConverter implements MongoConverter, ApplicationContext
}
return Arrays.asList(items);
}
Class<?> toType = findTypeToBeUsed((DBObject) dbObj);
// It's a complex object, have to read it in
if (dbo.containsField("_class")) {
Class<?> toType = findTypeToBeUsed((DBObject) dbObj);
dbo.removeField("_class");
if (toType != null) {
dbo.removeField(CUSTOM_TYPE_KEY);
o = read(toType, (DBObject) dbObj);
} else {
o = read(mappingContext.getPersistentEntity(prop.getTypeInformation()), (DBObject) dbObj);
@@ -593,7 +594,11 @@ public class MappingMongoConverter implements MongoConverter, ApplicationContext
*/
protected Class<?> findTypeToBeUsed(DBObject dbObject) {
Object classToBeUsed = dbObject.get(CUSTOM_TYPE_KEY);
if (classToBeUsed == null) {
return null;
}
try {
return Class.forName(classToBeUsed.toString());
} catch (ClassNotFoundException e) {