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

polishing

Browse Source 
renamed BreakingChanges-1.2.txt to BreakingChanges-1.3.txt
This commit is contained in:
eeichinger
2009-07-26 16:05:31 +00:00
parent 6610f5e014
commit 640cddbd91
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
BreakingChanges-1.2.txt → BreakingChanges-1.3.txt
View File

15
src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectFactory.cs
View File

@@ -1714,14 +1714,11 @@ namespace Spring.Objects.Factory.Support
}
/// <summary>
/// Does this object factory contain an object with the given name?
/// Does this object factory or one of its parent factories contain an object with the given name?
/// </summary>
/// <remarks>
/// This method does not (and it should not) check if the specified
/// object exists in one of the parent object factories. If it did,
/// message sources and event registries within application context
/// hierarchy would have circular references, which would cause stack
/// overflows during message lookup, for example. (A. Seovic)
/// This method scans the object factory hierarchy starting with the current factory instance upwards.
/// Use <see cref="ContainsLocalObject"/> if you want to explicitely check just this object factory instance.
/// </remarks>
/// <see cref="Spring.Objects.Factory.IObjectFactory.ContainsObject"/>.
public bool ContainsObject(string name)
@@ -1745,11 +1742,7 @@ namespace Spring.Objects.Factory.Support
{
string objectName = TransformedObjectName(name);
// check if object actually exists in this object factory...
bool isInSingletonCache = false;
lock (singletonCache)
{
isInSingletonCache = singletonCache.Contains(objectName);
}
bool isInSingletonCache = ContainsSingleton(objectName);
if (isInSingletonCache || ContainsObjectDefinition(objectName))
{
// if found, gather aliases...