From 8058adb1fe5a77d835b507e74a48ba3b45dfd9c3 Mon Sep 17 00:00:00 2001
From: Aaron Heckmann <aaron.heckmann+github@gmail.com>
Date: Thu, 15 Dec 2011 16:03:01 -0500
Subject: [PATCH] clean up conflicting mods test

---
 lib/schema/documentarray.js | 19 +++----------------
 test/types.array.test.js    |  2 --
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/lib/schema/documentarray.js b/lib/schema/documentarray.js
index 39326a99656..45f3fd16968 100644
--- a/lib/schema/documentarray.js
+++ b/lib/schema/documentarray.js
@@ -116,22 +116,9 @@ DocumentArray.prototype.cast = function (value, doc, init, prev) {
           delete subdoc._doc._id;
           value[i] = subdoc.init(value[i]);
         } else {
-
-          if (subdoc = prev && prev.id(value[i]._id)) {
-            var val = value[i];
-            value[i] = subdoc;
-            subdoc.parentarray = value;
-            subdoc.parent = value._parent;
-            subdoc.set(val);
-          } else {
-            subdoc = new this.caster(null, value);
-            value[i] = subdoc.set(value[i]);
-          }
-
-          //console.error('existing', prev && !!prev.id(value[i]._id));
-          //subdoc = prev && prev.id(value[i]._id) ||
-                   //new this.caster(null, value);
-          //value[i] = subdoc.set(value[i]);
+          subdoc = prev && prev.id(value[i]._id) ||
+                   new this.caster(null, value);
+          value[i] = subdoc.set(value[i]);
         }
       }
     }
diff --git a/test/types.array.test.js b/test/types.array.test.js
index deaea128903..fad79f8b3f2 100644
--- a/test/types.array.test.js
+++ b/test/types.array.test.js
@@ -493,8 +493,6 @@ module.exports = {
         x[2] = n[1];
         d.em1 = x.filter(Boolean);
 
-        //mongoose.set('debug', true);
-
         d.save(function (err) {
           should.strictEqual(null, err);
           D.findById(d, function (err, d) {