[Springnet-commits] Spring.Net/src/Spring/Spring.Core/Objects/Factory/Support AbstractAutowireCapableObjectFactory.cs, 1.83, 1.84

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Objects/Factory/Support
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7587/Support

Modified Files:
	AbstractAutowireCapableObjectFactory.cs 
Log Message:
(Partial Fix) SPRNET-867 - Add line number to top level error message when there are XML parsing errors.

Index: AbstractAutowireCapableObjectFactory.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Objects/Factory/Support/AbstractAutowireCapableObjectFactory.cs,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** AbstractAutowireCapableObjectFactory.cs	5 Dec 2007 00:28:04 -0000	1.83
--- AbstractAutowireCapableObjectFactory.cs	4 Feb 2008 22:44:03 -0000	1.84
***************
*** 885,894 ****
                  instanceWrapper = InstantiateUsingFactoryMethod(name, definition, arguments);
              }
!                 //Handle case when arguments are passed in explicitly.
              else if (arguments != null && arguments.Length > 0)
              {
                  instanceWrapper = AutowireConstructor(name, definition, arguments);
              }
!             else if (definition.ResolvedAutowireMode == AutoWiringMode.Constructor || definition.HasConstructorArgumentValues)
              {
                  instanceWrapper = AutowireConstructor(name, definition);
--- 885,895 ----
                  instanceWrapper = InstantiateUsingFactoryMethod(name, definition, arguments);
              }
!             //Handle case when arguments are passed in explicitly.
              else if (arguments != null && arguments.Length > 0)
              {
                  instanceWrapper = AutowireConstructor(name, definition, arguments);
              }
!             else if (definition.ResolvedAutowireMode == AutoWiringMode.Constructor || 
!                      definition.HasConstructorArgumentValues)
              {
                  instanceWrapper = AutowireConstructor(name, definition);