From f41e60a2649141906a8701ce4677d55abeafd21d Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Thu, 17 Mar 2011 23:04:28 +0100
Subject: [PATCH] Prefer considering the value type over the property type at
 the decision whether to recursively map an object or simply write it as plain
 value.

Removed obsolete code (probably introduced by invalidly resolving a merge conflict).
---
 .../mongodb/convert/MappingMongoConverter.java     | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MappingMongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MappingMongoConverter.java
index 6e86d15b9..bc74d2c88 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MappingMongoConverter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MappingMongoConverter.java
@@ -271,17 +271,7 @@ public class MappingMongoConverter implements MongoConverter, ApplicationContext
     // Set properties not already set in the constructor
     entity.doWithProperties(new PropertyHandler() {
       public void doWithPersistentProperty(PersistentProperty prop) {
-        if (!ctorParamNames.contains(prop.getName())) {
-          Object obj = getValueInternal(prop, dbo, spelCtx, prop.getValueAnnotation());
-          try {
-            MappingBeanHelper.setProperty(instance, prop, obj, useFieldAccessOnly);
-          } catch (IllegalAccessException e) {
-            throw new MappingException(e.getMessage(), e);
-          } catch (InvocationTargetException e) {
-            throw new MappingException(e.getMessage(), e);
-          }
-        }
-
+        
         if (ctorParamNames.contains(prop.getName())) {
           return;
         }
@@ -381,7 +371,7 @@ public class MappingMongoConverter implements MongoConverter, ApplicationContext
           throw new MappingException(e.getMessage(), e);
         }
         if (null != propertyObj) {
-          if (prop.isComplexType()) {
+          if (!MappingBeanHelper.isSimpleType(propertyObj.getClass())) {
             writePropertyInternal(prop, propertyObj, dbo);
           } else {
             dbo.put(name, propertyObj);