From c6c9a938e21f564041b11bb9f600fc5375bf9733 Mon Sep 17 00:00:00 2001 From: eeichinger Date: Sun, 22 Jun 2008 07:50:42 +0000 Subject: [PATCH] changed ConfigureObject(target, name) to return original target if no definition is found --- .../Support/AbstractAutowireCapableObjectFactory.cs | 2 +- .../Objects/Factory/DefaultListableObjectFactoryTests.cs | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractAutowireCapableObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractAutowireCapableObjectFactory.cs index f4dfda8f..ec7c1e9c 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractAutowireCapableObjectFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractAutowireCapableObjectFactory.cs @@ -2104,7 +2104,7 @@ namespace Spring.Objects.Factory.Support return ConfigureObject(name, definition, new ObjectWrapper(target)); } - return null; + return target; } /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryTests.cs index 7e4791d4..7b3c9bab 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryTests.cs @@ -1337,6 +1337,15 @@ namespace Spring.Objects.Factory Assert.AreEqual(1, lof.ObjectPostProcessorCount, errMsg); } + [Test] + public void ConfigureObjectReturnsOriginalInstanceIfNoDefinitionFound() + { + IConfigurableObjectFactory of = new DefaultListableObjectFactory(); + object testObject = new object(); + object resultObject = of.ConfigureObject(testObject, "non-existing object definition name"); + Assert.AreSame(testObject, resultObject); + } + #region Helper Classes public class GoodDisposable : IDisposable