From 94f697da10ebb9e748e9cce25ffa3a6255344a0b Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 17 Apr 2013 10:24:37 +0200 Subject: [PATCH] DATAMONGO-656 - Fixed potential NPE in MongoTemplate. --- .../org/springframework/data/mongodb/core/MongoTemplate.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java index d8833765c..3fc98ad84 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java @@ -981,11 +981,12 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware { Assert.notNull(object); - MongoPersistentEntity entity = mappingContext.getPersistentEntity(object.getClass()); + Class objectType = object.getClass(); + MongoPersistentEntity entity = mappingContext.getPersistentEntity(objectType); MongoPersistentProperty idProp = entity == null ? null : entity.getIdProperty(); if (idProp == null) { - throw new MappingException("No id property found for object of type " + entity.getType().getName()); + throw new MappingException("No id property found for object of type " + objectType); } ConversionService service = mongoConverter.getConversionService();