Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix issue 114

Browse Source 
https://github.com/spring-projects/spring-net/issues/114
This commit is contained in:
gitchomik
2015-05-26 07:31:13 +02:00
parent cdfcc1d9a6
commit bb2e263f94
1 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/Spring/Spring.Core/Objects/Factory/Support/DefaultListableObjectFactory.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright <EFBFBD> 2002-2011 the original author or authors.
* Copyright © 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -223,36 +223,34 @@ namespace Spring.Objects.Factory.Support
protected override IList<string> GetDependingObjectNames(string objectName)
{
List<string> dependingObjectNames = new List<string>();
IList<string> allObjectDefinitionNames = GetObjectDefinitionNames();
foreach (string name in allObjectDefinitionNames)
{
if (ContainsObjectDefinition(name))
{
RootObjectDefinition rod = GetMergedObjectDefinition(name, false);
if (rod.DependsOn != null)
{
HashSet<string> dependsOn = new HashSet<string>(rod.DependsOn);
if (dependsOn.Contains(objectName))
{
#region Instrumentation
if (log.IsDebugEnabled)
{
log.Debug(string.Format(
CultureInfo.InvariantCulture,
"Found depending object '{0}' for object '{1}'.",
name, objectName));
}
#endregion
dependingObjectNames.Add(name);
}
}
}
}
return dependingObjectNames;
}
if (dependingObjectNamesCache == null)
{
dependingObjectNamesCache = new Dictionary<string, List<string>>();
IList<string> allObjectDefinitionNames = GetObjectDefinitionNames();
foreach (string name in allObjectDefinitionNames)
{
if (ContainsObjectDefinition(name))
{
RootObjectDefinition rod = GetMergedObjectDefinition(name, false);
if (rod.DependsOn != null)
{
foreach (var dependsOnName in rod.DependsOn)
{
if (!dependingObjectNamesCache.TryGetValue(dependsOnName, out dependingObjectNames))
{
dependingObjectNames = new List<string>();
dependingObjectNamesCache.Add(dependsOnName, dependingObjectNames);
}
dependingObjectNames.Add(name);
}
}
}
}
}
if (dependingObjectNamesCache.TryGetValue(objectName, out dependingObjectNames))
return dependingObjectNames;
return new string[]{};
}
/// <summary>
/// Check whether the specified object matches the supplied <paramref name="type"/>.
@@ -294,6 +292,11 @@ namespace Spring.Objects.Factory.Support
#region Fields
/// <summary>
/// The mapping of object depending object names, keyed by object name.
/// </summary>
private IDictionary<string, List<string>> dependingObjectNamesCache;
/// <summary>
/// The <see cref="Common.Logging.ILog"/> instance for this class.
/// </summary>