|
From: <m_p...@us...> - 2014-09-26 16:14:30
|
Revision: 237
http://sourceforge.net/p/beeframework/code/237
Author: m_plomer
Date: 2014-09-26 16:14:27 +0000 (Fri, 26 Sep 2014)
Log Message:
-----------
Context/Xml: top level beans now have an ID autogenerated if none defined
Modified Paths:
--------------
trunk/framework/Bee/Context/Xml/ParserDelegate.php
Modified: trunk/framework/Bee/Context/Xml/ParserDelegate.php
===================================================================
--- trunk/framework/Bee/Context/Xml/ParserDelegate.php 2014-09-26 16:10:02 UTC (rev 236)
+++ trunk/framework/Bee/Context/Xml/ParserDelegate.php 2014-09-26 16:14:27 UTC (rev 237)
@@ -754,7 +754,9 @@
$bd = !is_null($handler) ? $handler->parse($ele, new ParserContext($this->readerContext, $this, $containingBd)) : null;
if (!is_null($bd)) {
$beanName = BeanDefinitionReaderUtils::generateBeanName($bd, $this->readerContext->getRegistry(), true);
- $this->readerContext->getRegistry()->registerBeanDefinition($beanName, $bd);
+ if(!$this->readerContext->getRegistry()->containsBeanDefinition($beanName)) {
+ $this->readerContext->getRegistry()->registerBeanDefinition($beanName, $bd);
+ }
$bd = $this->decorateBeanDefinitionIfRequired($ele, new BeanDefinitionHolder($bd, $beanName));
}
return $bd;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
