Skip to content

Commit b20002b

Browse files
bahusoidfredericDelaporte
authored andcommitted
Lazy mapping schema loading
1 parent 3747daf commit b20002b

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/NHibernate/Cfg/XmlSchemas.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ internal class XmlSchemas
1111
private const string MappingSchemaResource = "NHibernate.nhibernate-mapping.xsd";
1212

1313
private static readonly XmlSchemaSet ConfigSchemaSet = ReadXmlSchemaFromEmbeddedResource(CfgSchemaResource);
14-
private static readonly XmlSchemaSet MappingSchemaSet = ReadXmlSchemaFromEmbeddedResource(MappingSchemaResource);
14+
15+
private static class MappingSchemaHolder
16+
{
17+
public static readonly XmlSchemaSet MappingSchemaSet = ReadXmlSchemaFromEmbeddedResource(MappingSchemaResource);
18+
}
1519

1620
public XmlReaderSettings CreateConfigReaderSettings()
1721
{
@@ -23,7 +27,7 @@ public XmlReaderSettings CreateConfigReaderSettings()
2327

2428
public XmlReaderSettings CreateMappingReaderSettings()
2529
{
26-
return CreateXmlReaderSettings(MappingSchemaSet);
30+
return CreateXmlReaderSettings(MappingSchemaHolder.MappingSchemaSet);
2731
}
2832

2933
private static XmlSchemaSet ReadXmlSchemaFromEmbeddedResource(string resourceName)
@@ -50,4 +54,4 @@ private static void ConfigSettingsValidationEventHandler(object sender, Validati
5054
throw new HibernateConfigException("An exception occurred parsing configuration :" + e.Message, e.Exception);
5155
}
5256
}
53-
}
57+
}

0 commit comments

Comments
 (0)