Merge pull request #83 from MarkJPerry/master

jagregory · jagregory · commit cc57cf2d2ec3 · 2011-10-02T11:17:36.000-07:00
FIX for : #45
diff --git a/src/FluentNHibernate/Cfg/FluentMappingsContainer.cs b/src/FluentNHibernate/Cfg/FluentMappingsContainer.cs
@@ -127,6 +127,8 @@ internal void Apply(PersistenceModel model)
                 model.Add(type);
             }
 
+			model.Conventions.Merge(conventionFinder);
+
             if (!string.IsNullOrEmpty(exportPath))
                 model.WriteMappingsTo(exportPath);
 
@@ -135,8 +137,6 @@ internal void Apply(PersistenceModel model)
 
             if (biDirectionalManyToManyPairer != null)
                 model.BiDirectionalManyToManyPairer = biDirectionalManyToManyPairer;
-
-            model.Conventions.Merge(conventionFinder);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,8 @@ internal void Apply(PersistenceModel model)`
`127`	`127`	`model.Add(type);`
`128`	`128`	`}`
`129`	`129`
	`130`	`+ model.Conventions.Merge(conventionFinder);`
	`131`	`+`
`130`	`132`	`if (!string.IsNullOrEmpty(exportPath))`
`131`	`133`	`model.WriteMappingsTo(exportPath);`
`132`	`134`
`@@ -135,8 +137,6 @@ internal void Apply(PersistenceModel model)`
`135`	`137`
`136`	`138`	`if (biDirectionalManyToManyPairer != null)`
`137`	`139`	`model.BiDirectionalManyToManyPairer = biDirectionalManyToManyPairer;`
`138`		`-`
`139`		`- model.Conventions.Merge(conventionFinder);`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`	`}`