diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPlaceholderConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPlaceholderConfigurer.cs index 13dd40e9..2b0b3b30 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPlaceholderConfigurer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPlaceholderConfigurer.cs @@ -223,50 +223,51 @@ namespace Spring.Objects.Factory.Config #endregion - /// - /// Apply the given properties to the supplied - /// . - /// - /// - /// The - /// used by the application context. - /// - /// The properties to apply. - /// - /// If an error occured. - /// - protected override void ProcessProperties(IConfigurableListableObjectFactory factory, NameValueCollection props) - { - PlaceholderResolveHandlerAdapter resolveAdapter = new PlaceholderResolveHandlerAdapter(this, props); - ObjectDefinitionVisitor visitor = new ObjectDefinitionVisitor(resolveAdapter.ParseAndResolveVariables); + /// + /// Apply the given properties to the supplied + /// . + /// + /// + /// The + /// used by the application context. + /// + /// The properties to apply. + /// + /// If an error occured. + /// + protected override void ProcessProperties(IConfigurableListableObjectFactory factory, NameValueCollection props) + { + PlaceholderResolveHandlerAdapter resolveAdapter = new PlaceholderResolveHandlerAdapter(this, props); + ObjectDefinitionVisitor visitor = new ObjectDefinitionVisitor(resolveAdapter.ParseAndResolveVariables); - IList objectDefinitionNames = factory.GetObjectDefinitionNames(includeAncestors); - for (int i = 0; i < objectDefinitionNames.Count; ++i) - { - string name = objectDefinitionNames[i]; - IObjectDefinition definition = factory.GetObjectDefinition(name, includeAncestors); + IList objectDefinitionNames = factory.GetObjectDefinitionNames(includeAncestors); + for (int i = 0; i < objectDefinitionNames.Count; ++i) + { + string name = objectDefinitionNames[i]; + IObjectDefinition definition = factory.GetObjectDefinition(name, includeAncestors); - if (definition == null) - { - logger.ErrorFormat("'{0}' can't be found in factorys' '{1}' object definition (includeAncestor {2})", name, factory, includeAncestors); - continue; - } + if (definition == null) + { + logger.ErrorFormat("'{0}' can't be found in factorys' '{1}' object definition (includeAncestor {2})", + name, factory, includeAncestors); + continue; + } - try - { - visitor.VisitObjectDefinition(definition); - } - catch (ObjectDefinitionStoreException ex) - { - throw new ObjectDefinitionStoreException( - definition.ResourceDescription, name, ex.Message); - } - } + try + { + visitor.VisitObjectDefinition(definition); + } + catch (ObjectDefinitionStoreException ex) + { + throw new ObjectDefinitionStoreException( + definition.ResourceDescription, name, ex.Message); + } + } - factory.AddEmbeddedValueResolver(resolveAdapter); - } + factory.AddEmbeddedValueResolver(resolveAdapter); + } - /// + /// /// Parse values recursively to be able to resolve cross-references between /// placeholder values. /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/DefaultListableObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Support/DefaultListableObjectFactory.cs index 8f7083c7..47814eb0 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/DefaultListableObjectFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/DefaultListableObjectFactory.cs @@ -181,7 +181,7 @@ namespace Spring.Objects.Factory.Support /// ///

/// Called by autowiring. If a subclass cannot obtain information about object - /// -pnames by , a corresponding exception should be thrown. + /// names by , a corresponding exception should be thrown. ///

///
/// @@ -239,9 +239,9 @@ namespace Spring.Objects.Factory.Support if (log.IsDebugEnabled) { log.Debug(string.Format( - CultureInfo.InvariantCulture, - "Found depending object '{0}' for object '{1}'.", - name, objectName)); + CultureInfo.InvariantCulture, + "Found depending object '{0}' for object '{1}'.", + name, objectName)); } #endregion @@ -275,7 +275,12 @@ namespace Spring.Objects.Factory.Support return (objectType != null && type.IsAssignableFrom(objectType)); } - private bool IsObjectDefinitionTypeMatch(string name, Type checkedType, bool includeAncestor = false) + private bool IsObjectDefinitionTypeMatch(string name, Type checkedType) + { + return IsObjectDefinitionTypeMatch(name, checkedType, false); + } + + private bool IsObjectDefinitionTypeMatch(string name, Type checkedType, bool includeAncestor) { if (checkedType == null) {