From f7a24a46511dbaeb1a8892d98630ba30fac9171c Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Tue, 9 Feb 2016 16:41:40 +0900
Subject: [PATCH] Issue #2412363 by Arla, zealfire, mgifford, xjm, fago:
 ComplexDataDefinition::getPropertyDefinition() does not need to check
 ->propertyDefinitions

---
 .../Drupal/Core/TypedData/ComplexDataDefinitionBase.php   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/lib/Drupal/Core/TypedData/ComplexDataDefinitionBase.php b/core/lib/Drupal/Core/TypedData/ComplexDataDefinitionBase.php
index 1fa5dabb30f..37114dba33a 100644
--- a/core/lib/Drupal/Core/TypedData/ComplexDataDefinitionBase.php
+++ b/core/lib/Drupal/Core/TypedData/ComplexDataDefinitionBase.php
@@ -28,11 +28,9 @@ abstract class ComplexDataDefinitionBase extends DataDefinition implements Compl
    * {@inheritdoc}
    */
   public function getPropertyDefinition($name) {
-    if (!isset($this->propertyDefinitions)) {
-      $this->getPropertyDefinitions();
-    }
-    if (isset($this->propertyDefinitions[$name])) {
-      return $this->propertyDefinitions[$name];
+    $definitions = $this->getPropertyDefinitions();
+    if (isset($definitions[$name])) {
+      return $definitions[$name];
     }
   }