From e09235a449eb115e68ca658abc0c67affa012327 Mon Sep 17 00:00:00 2001
From: Thomas Trageser <thomast74@gmail.com>
Date: Sun, 27 Jan 2013 22:34:56 +0000
Subject: [PATCH] NPE when using AbstractDependencyInjecttionSpringContextTests
 and Autowire within test class

---
 .../Attributes/AutowiredAttributeObjectPostProcessor.cs     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Spring/Spring.Core/Objects/Factory/Attributes/AutowiredAttributeObjectPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Attributes/AutowiredAttributeObjectPostProcessor.cs
index 38ad3593..8b0320fe 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Attributes/AutowiredAttributeObjectPostProcessor.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Attributes/AutowiredAttributeObjectPostProcessor.cs
@@ -369,9 +369,13 @@ namespace Spring.Objects.Factory.Attributes
         /// </summary>
         private static void RegisterDependentObjects(string objectName, IList autowiredObjectNames)
         {
-            if (objectName == null) return;
+            if (objectName == null) 
+                return;
 
             var objectDefinition = _objectFactory.GetObjectDefinition(objectName) as RootObjectDefinition;
+            if (objectDefinition == null)
+                return;
+
             IList<string> dependsOn = new List<string>(objectDefinition.DependsOn);
             foreach (var name in autowiredObjectNames)
             {