DATADOC-86 - Bug in deserialisation of Entitys with Embedded Collections

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

@@ -420,6 +420,8 @@ public class MappingMongoConverter implements MongoConverter, ApplicationContext
 					dbList.add(dbRef);
 				} else if (type.isArray() && MappingBeanHelper.isSimpleType(type.getComponentType())) {
 				  dbList.add(propObjItem);
+				} else if (MappingBeanHelper.isSimpleType(propObjItem.getClass())) {				  
+					dbList.add(propObjItem);
 				} else {
 					BasicDBObject propDbObj = new BasicDBObject();
 					write(propObjItem, propDbObj, mappingContext.getPersistentEntity(prop.getTypeInformation()));

spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/MongoTemplateTests.java

@@ -337,7 +337,7 @@ public class MongoTemplateTests {
 	  testAddingToList(this.template);
   }
 
-  //@Test
+  @Test
   public void testAddingToListWithMappingConverter() throws Exception {
 	  testAddingToList(this.mappingTemplate);
   }