Merge pull request #4 from NikGovorov/NH-2489

Addition to NH-2489. (NH-2881)

Author: patearl

src/NHibernate.Test/NHSpecificTest/NH2489/Fixture.cs

@@ -62,6 +62,19 @@ public MapScenario(ISessionFactory factory)
 						                       	{"Child1", new Child()},
 						                       	{"NullChild", null},
 						                       };
+
+                        var child1 = new AnotherChild { Name = "AnotherChild1" };
+                        var child2 = new AnotherChild { Name = "AnotherChild2" };
+
+					    s.Save(child1);
+					    s.Save(child2);
+
+                        entity.OneToManyNamedChildren = new Dictionary<string, AnotherChild> 
+                                               {
+                                                {"AnotherChild1" , child1}, 
+                                                {"AnotherChild2" , child2} 
+                                               };
+
 						s.Save(entity);
 						t.Commit();
 					}
@@ -143,8 +156,11 @@ public void Map_Item()
 						var entity = s.CreateQuery("from Base").UniqueResult<Base>();
 						// null collection members don't seem to work, at least for lazy="extra" collections
 						entity.NamedChildren.Count.Should().Be.EqualTo(2);
+                        entity.OneToManyNamedChildren.Count.Should().Be.EqualTo(2);
 						NHibernateUtil.IsInitialized(entity.NamedChildren).Should().Be.False();
 						Executing.This(() => { Child ignored = entity.NamedChildren["InvalidKey"]; }).Should().Throw<KeyNotFoundException>();
+                        Executing.This(() => { AnotherChild ignored = entity.OneToManyNamedChildren["InvalidKey"]; }).Should().Throw<KeyNotFoundException>();
+                        NHibernateUtil.IsInitialized(entity.NamedChildren).Should().Be.False();
 					}
 				}
 			}
@@ -167,6 +183,10 @@ public void Map_TryGetValue_Invalid()
 						Child child;
 						entity.NamedChildren.TryGetValue("InvalidKey", out child).Should().Be.False();
 						child.Should().Be.Null();
+                        AnotherChild anotherChild;
+                        entity.OneToManyNamedChildren.TryGetValue("InvalidKey", out anotherChild).Should().Be.False();
+                        child.Should().Be.Null();
+                        NHibernateUtil.IsInitialized(entity.NamedChildren).Should().Be.False();
 					}
 				}
 			}

src/NHibernate.Test/NHSpecificTest/NH2489/Mappings.hbm.xml

@@ -20,12 +20,26 @@
         <column name="Child" not-null="false" />
       </many-to-many>
     </map>
+
+    <map name="OneToManyNamedChildren" lazy="extra" cascade="all" >
+      <key column="Bid" />
+      <index column="Name" type="string" />
+      <one-to-many class="AnotherChild"/>
+    </map>
   </class>
 
   <class name="Child">
     <id name="Id">
       <generator class="increment"/>
     </id>
   </class>
-  
+
+  <class name="AnotherChild">
+    <id name="Id">
+      <generator class="increment"/>
+    </id>
+    <property name="Name"></property>
+  </class>
+
+
 </hibernate-mapping>

src/NHibernate.Test/NHSpecificTest/NH2489/Model.cs

@@ -21,6 +21,12 @@ public virtual IDictionary<string, Child> NamedChildren
             get;
             set;
         }
+
+        public virtual IDictionary<string, AnotherChild> OneToManyNamedChildren
+        {
+            get;
+            set;
+        }
     }
 
     public class Child
@@ -31,4 +37,19 @@ public virtual int Id
             set;
         }
     }
+
+    public class AnotherChild
+    {
+        public virtual int Id
+        {
+            get;
+            set;
+        }
+
+        public virtual string Name
+        {
+            get;
+            set;
+        }
+    }
 }

src/NHibernate/Persister/Collection/OneToManyPersister.cs

@@ -388,7 +388,7 @@ protected override ICollectionInitializer CreateSubselectInitializer(
 
 		public override object GetElementByIndex(object key, object index, ISessionImplementor session, object owner)
 		{
-			return new CollectionElementLoader(this, Factory, session.EnabledFilters).LoadElement(session, key, IncrementIndexByBase(index));
+			return new CollectionElementLoader(this, Factory, session.EnabledFilters).LoadElement(session, key, IncrementIndexByBase(index)) ?? NotFoundObject;
 		}
 		#region NH Specific
 		protected override SqlCommandInfo GenerateIdentityInsertRowString()