From 8615e8e90ed3bb833b7de8be95b2d5b8bd2ebdba Mon Sep 17 00:00:00 2001
From: romanb <romanb@625475ce-881a-0410-a577-b389adb331d8>
Date: Sat, 13 Sep 2008 20:12:08 +0000
Subject: [PATCH] minor refactoring

---
 .../ORM/Internal/Hydration/StandardHydrator.php    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/Doctrine/ORM/Internal/Hydration/StandardHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/StandardHydrator.php
index b58503539..bc56fd48c 100644
--- a/lib/Doctrine/ORM/Internal/Hydration/StandardHydrator.php
+++ b/lib/Doctrine/ORM/Internal/Hydration/StandardHydrator.php
@@ -266,16 +266,16 @@ class Doctrine_ORM_Internal_Hydration_StandardHydrator extends Doctrine_ORM_Inte
                                 $driver->getElement($data, $entityName));
                     }
                 }
+                
                 if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) {
-                    if (($coll =& $driver->getReferenceValue($baseElement, $relationAlias)) !== null) {
-                        $this->_updateResultPointer($resultPointers, $coll, $index, $dqlAlias, $oneToOne);   
-                    }
+                    $coll =& $driver->getReferenceValue($baseElement, $relationAlias);
                 } else {
-                    if (($coll = $driver->getReferenceValue($baseElement, $relationAlias)) !== null) {
-                        $this->_updateResultPointer($resultPointers, $coll, $index, $dqlAlias, $oneToOne);   
-                    }
+                    $coll = $driver->getReferenceValue($baseElement, $relationAlias);
+                }
+                
+                if ($coll !== null) {
+                    $this->_updateResultPointer($resultPointers, $coll, $index, $dqlAlias, $oneToOne); 
                 }
-
             }
             
             // append scalar values to mixed result sets