Skip to content

Commit 94f697d

Browse files
committed
DATAMONGO-656 - Fixed potential NPE in MongoTemplate.
1 parent 0cdec56 commit 94f697d

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -981,11 +981,12 @@ private Query getIdQueryFor(Object object) {
981981

982982
Assert.notNull(object);
983983

984-
MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(object.getClass());
984+
Class<?> objectType = object.getClass();
985+
MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(objectType);
985986
MongoPersistentProperty idProp = entity == null ? null : entity.getIdProperty();
986987

987988
if (idProp == null) {
988-
throw new MappingException("No id property found for object of type " + entity.getType().getName());
989+
throw new MappingException("No id property found for object of type " + objectType);
989990
}
990991

991992
ConversionService service = mongoConverter.getConversionService();

0 commit comments

Comments
 (0)