Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Objects/Factory/Support
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23687/src/Spring/Spring.Core/Objects/Factory/Support
Modified Files:
AbstractAutowireCapableObjectFactory.cs
AbstractObjectFactory.cs
Log Message:
fixed SPRNET-920
Index: AbstractAutowireCapableObjectFactory.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Objects/Factory/Support/AbstractAutowireCapableObjectFactory.cs,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** AbstractAutowireCapableObjectFactory.cs 2 Apr 2008 18:02:24 -0000 1.86
--- AbstractAutowireCapableObjectFactory.cs 5 Apr 2008 13:35:35 -0000 1.87
***************
*** 799,803 ****
{
// guarantee the initialization of objects that the current one depends on..
! if (definition.DependsOn != null)
{
foreach (string dependant in definition.DependsOn)
--- 799,803 ----
{
// guarantee the initialization of objects that the current one depends on..
! if (definition.DependsOn != null && definition.DependsOn.Length > 0)
{
foreach (string dependant in definition.DependsOn)
Index: AbstractObjectFactory.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectFactory.cs,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** AbstractObjectFactory.cs 3 Apr 2008 05:33:14 -0000 1.75
--- AbstractObjectFactory.cs 5 Apr 2008 13:35:35 -0000 1.76
***************
*** 264,268 ****
if (ParentObjectFactory != null)
{
! return ParentObjectFactory.GetObject(name);
}
throw new NoSuchObjectDefinitionException(name, "Cannot find definition for object [" + name + "]");
--- 264,268 ----
if (ParentObjectFactory != null)
{
! return ParentObjectFactory.GetObject(name, requiredType, arguments);
}
throw new NoSuchObjectDefinitionException(name, "Cannot find definition for object [" + name + "]");
|