From 57970499fdd2eb6436494131fba517dde70541a7 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sun, 11 Dec 2011 16:11:16 +0100
Subject: [PATCH] Revert "DDC-1515 - Merge from 2.1.x"

This reverts commit bd0fb574e3ac0a578202b171b83775b9a3bbf953.
---
 .../Internal/Hydration/AbstractHydrator.php   |  1 -
 .../ORM/Internal/Hydration/ObjectHydrator.php |  4 +-
 .../ORM/Functional/Ticket/DDC1515Test.php     | 64 -------------------
 3 files changed, 2 insertions(+), 67 deletions(-)
 delete mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php

diff --git a/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
index 436a93666..146dfb5c5 100644
--- a/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
+++ b/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
@@ -244,7 +244,6 @@ abstract class AbstractHydrator
 
             if (isset($cache[$key]['isMetaColumn'])) {
                 if ( ! isset($rowData[$dqlAlias][$cache[$key]['fieldName']]) || $value !== null) {
-                    $nonemptyComponents[$dqlAlias] = true;
                     $rowData[$dqlAlias][$cache[$key]['fieldName']] = $value;
                 }
 
diff --git a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
index 49737ac58..36dbfa46a 100644
--- a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
+++ b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
@@ -332,9 +332,9 @@ class ObjectHydrator extends AbstractHydrator
         // Hydrate the data chunks
         foreach ($rowData as $dqlAlias => $data) {
             $entityName = $this->_rsm->aliasMap[$dqlAlias];
- 
+
             if (isset($this->_rsm->parentAliasMap[$dqlAlias])) {
-               // It's a joined result
+                // It's a joined result
 
                 $parentAlias = $this->_rsm->parentAliasMap[$dqlAlias];
                 // we need the $path to save into the identifier map which entities were already
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php
deleted file mode 100644
index 9bd3360b8..000000000
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\ORM\Functional\Ticket;
-
-
-/**
- * @group DDC-1515
- */
-class DDC1515Test extends \Doctrine\Tests\OrmFunctionalTestCase
-{
-    public function setUp()
-    {
-        parent::setUp();
-        $this->_schemaTool->createSchema(array(
-            $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1515Foo'),
-            $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1515Bar'),
-        ));
-    }
-
-    public function testIssue()
-    {
-        $bar = new DDC1515Bar();
-        $this->_em->persist($bar);
-        $this->_em->flush();
-
-        $foo = new DDC1515Foo();
-        $foo->bar = $bar;
-        $this->_em->persist($foo);
-        $this->_em->flush();
-        $this->_em->clear();
-
-        $bar = $this->_em->find(__NAMESPACE__ . '\DDC1515Bar', $bar->id);
-        $this->assertInstanceOf(__NAMESPACE__.'\DDC1515Foo', $bar->foo);
-    }
-}
-
-/**
- * @Entity
- */
-class DDC1515Foo
-{
-    /**
-     * @OneToOne(targetEntity="DDC1515Bar", inversedBy="foo") @Id
-     */
-    public $bar;
-}
-
-/**
- * @Entity
- */
-class DDC1515Bar
-{
-    /**
-     * @Id @Column(type="integer") @GeneratedValue
-     */
-    public $id;
-
-    /**
-     * @OneToOne(targetEntity="DDC1515Foo", mappedBy="bar")
-     */
-    public $foo;
-}
-
-