Merging latest 3.1 changes into trunk (r2672-2677)

1 files changed, 14 insertions, 0 deletions

diff --git a/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php b/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php
index 462b356f..f6e0acd5 100644
--- a/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php
+++ b/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php
@@ -712,6 +712,20 @@ class TSqlMapXmlMappingConfiguration extends TSqlMapXmlConfigBuilder
 		}

 		$cache = Prado::createComponent($cacheModel->getImplementationClass());

 		$this->setObjectPropFromNode($cache,$node,$properties);

+

+		foreach($node->xpath('property') as $propertyNode)

+		{

+			$name = $propertyNode->attributes()->name;

+			if($name===null || $name==='') continue;

+

+			$value = $propertyNode->attributes()->value;

+			if($value===null || $value==='') continue;

+

+			if( !TPropertyAccess::has($cache, $name) ) continue;

+

+			TPropertyAccess::set($cache, $name, $value);

+		}

+

 		$this->loadFlushInterval($cacheModel,$node);

 

 		$cacheModel->initialize($cache);