Merge pull request #1146 from JonRobidus/develop

andersjonsson · web-flow · commit 7266d6c46585 · 2025-08-21T10:30:53.000+02:00
Fix: "A concurrent update was performed on this collection and corrupted its state."
diff --git a/src/SoapCore.Tests/FaultExceptionTransformer/TestFaultExceptionTransformer.cs b/src/SoapCore.Tests/FaultExceptionTransformer/TestFaultExceptionTransformer.cs
@@ -9,7 +9,7 @@ namespace SoapCore.Tests.FaultExceptionTransformer
 {
 	public class TestFaultExceptionTransformer : IFaultExceptionTransformer
 	{
-		public Message ProvideFault(Exception exception, MessageVersion messageVersion, Message requestMessage, XmlNamespaceManager xmlNamespaceManager)
+		public Message ProvideFault(Exception exception, MessageVersion messageVersion, Message requestMessage, ConcurrentXmlNamespaceLookup xmlNamespaceLookup)
 		{
 			var fault = new TestFault
 			{
diff --git a/src/SoapCore.Tests/IntegrationTests.cs b/src/SoapCore.Tests/IntegrationTests.cs
@@ -343,6 +343,22 @@ public void EmptyBody()
 			Assert.AreEqual("OK", result);
 		}
 
+		/// <summary>
+		/// Handles concurrent calls correctly.
+		/// Test that reproduces (flaky, not with all runs) issue https://github.com/DigDes/SoapCore/issues/743
+		/// </summary>
+		/// <returns>Task</returns>
+		[TestMethod]
+		public async Task HandleConcurrentCallsCorrectly()
+		{
+			var client = CreateClient();
+
+			var r = await Task.WhenAll(client.AsyncMethod(), client.AsyncMethod());
+
+			Assert.AreEqual("hello, async", r[0]);
+			Assert.AreEqual("hello, async", r[1]);
+		}
+
 		private ITestService CreateClient(bool caseInsensitivePath = false)
 		{
 			var binding = new BasicHttpBinding();
diff --git a/src/SoapCore.Tests/Wsdl/WsdlTests.cs b/src/SoapCore.Tests/Wsdl/WsdlTests.cs
@@ -905,7 +905,7 @@ public async Task CheckSoapHeaderTypes(SoapSerializer soapSerializer)
 			Trace.TraceInformation(wsdl);
 
 			var root = XElement.Parse(wsdl);
-			var nm = Namespaces.CreateDefaultXmlNamespaceManager(false);
+			var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
 
 			var headerComplexType = root.XPathSelectElements("//xsd:complexType[@name='AuthenticationContextSoapHeader']", nm);
 			Assert.IsNotNull(headerComplexType);
@@ -932,7 +932,7 @@ public async Task CheckUnqualifiedMembersService(SoapSerializer soapSerializer)
 			Trace.TraceInformation(wsdl);
 
 			var root = XElement.Parse(wsdl);
-			var nm = Namespaces.CreateDefaultXmlNamespaceManager(false);
+			var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
 
 			bool allNeededAreUnqualified = root.XPathSelectElements($"//xsd:complexType[@name='{nameof(TypeWithUnqualifiedMembers)}' or @name='{nameof(UnqType2)}']/xsd:sequence/xsd:element[contains(@name, 'Unqualified')]", nm)
 				.All(x => x.Attribute("form")?.Value.Equals("unqualified") == true);
@@ -948,7 +948,7 @@ public async Task CheckUnqualifiedMembersService(SoapSerializer soapSerializer)
 		[DataRow(SoapSerializer.DataContractSerializer)]
 		public async Task CheckDateTimeOffsetServiceWsdl(SoapSerializer soapSerializer)
 		{
-			var nm = Namespaces.CreateDefaultXmlNamespaceManager(false);
+			var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
 
 			var wsdl = await GetWsdlFromMetaBodyWriter<DateTimeOffsetService>(soapSerializer);
 			var root = XElement.Parse(wsdl);
@@ -987,7 +987,7 @@ public async Task CheckXmlSchemaProviderTypeServiceWsdl(SoapSerializer soapSeria
 			Assert.IsNotNull(wsdl);
 
 			var root = XElement.Parse(wsdl);
-			var nm = Namespaces.CreateDefaultXmlNamespaceManager(false);
+			var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
 
 			var responseDateElem = root.XPathSelectElement("//xsd:element[@name='GetDateResponse']/xsd:complexType/xsd:sequence/xsd:element[@name='GetDateResult' and contains(@type, ':date')]", nm);
 			Assert.IsNotNull(responseDateElem);
@@ -1011,7 +1011,7 @@ public async Task CheckArrayServiceWsdl()
 			Assert.IsNotNull(wsdl);
 
 			var root = XElement.Parse(wsdl);
-			var nm = Namespaces.CreateDefaultXmlNamespaceManager(false);
+			var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
 
 			var nullableArray = root.XPathSelectElement("//xsd:complexType[@name='ArrayRequest']/xsd:sequence/xsd:element[@name='LongNullableArray' and @type='tns:ArrayOfNullableLong' and @nillable='true']", nm);
 			Assert.IsNotNull(nullableArray);
@@ -1051,7 +1051,7 @@ public void CheckEnumServiceWsdl()
 			Assert.IsNotNull(wsdl);
 
 			var root = XElement.Parse(wsdl);
-			var nm = Namespaces.CreateDefaultXmlNamespaceManager(false);
+			var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
 
 			var normalEnum = root.XPathSelectElement("//xsd:complexType[@name='TypeWithEnums']/xsd:sequence/xsd:element[@name='Enum' and @type='tns:NulEnum' and not(@nillable)]", nm);
 			Assert.IsNotNull(normalEnum);
@@ -1069,7 +1069,7 @@ public void CheckEnumSpecifiedBoolWsdl()
 			Assert.IsNotNull(wsdl);
 
 			var root = XElement.Parse(wsdl);
-			var nm = Namespaces.CreateDefaultXmlNamespaceManager(false);
+			var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
 
 			var enumWithSpecifiedBool = root.XPathSelectElement("//xsd:complexType[@name='TypeWithSpecifiedEnum']/xsd:sequence/xsd:element[@name='Enum' and @type='tns:NulEnum' and not(@nillable) and @minOccurs='0' and @maxOccurs='1']", nm);
 			Assert.IsNotNull(enumWithSpecifiedBool);
@@ -1126,7 +1126,7 @@ public async Task CheckXmlAnnotatedTypeServiceWsdl()
 			Assert.IsFalse(wsdl.Contains("name=\"\""));
 
 			var root = XElement.Parse(wsdl);
-			var nm = Namespaces.CreateDefaultXmlNamespaceManager(false);
+			var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
 
 			var requestTypeElement = root.XPathSelectElement("//xsd:element[@name='RequestRoot']", nm);
 			Assert.IsNotNull(requestTypeElement);
@@ -1171,7 +1171,7 @@ public void CheckXmlArrayAttributeTypeServiceWsdl()
 			Assert.IsNotNull(wsdl);
 
 			var root = XElement.Parse(wsdl);
-			var nm = Namespaces.CreateDefaultXmlNamespaceManager(false);
+			var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
 
 			var typeWithXmlArrayAttribute = root.XPathSelectElement("//xsd:complexType[@name='TypeWithXmlArrayAttribute']/xsd:sequence/xsd:element[@name='AvlRoomTypeItems' and @type='tns:ArrayOfAvlRoomTypeItem' and @nillable='true' and @minOccurs='0' and @maxOccurs='1']", nm);
 			Assert.IsNotNull(typeWithXmlArrayAttribute);
@@ -1193,7 +1193,7 @@ public async Task CheckXmlAnnotatedChoiceReturnServiceWsdl()
 			Assert.IsFalse(wsdl.Contains("name=\"\""));
 
 			var root = XElement.Parse(wsdl);
-			var nm = Namespaces.CreateDefaultXmlNamespaceManager(false);
+			var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
 
 			var requestTypeElement = root.XPathSelectElement("//xsd:element[@name='GetResponseResponse']", nm);
 			Assert.IsNotNull(requestTypeElement);
@@ -1224,7 +1224,7 @@ public async Task CheckMessageHeadersServiceWsdl()
 			Assert.IsFalse(wsdl.Contains("name=\"\""));
 
 			var root = XElement.Parse(wsdl);
-			var nm = Namespaces.CreateDefaultXmlNamespaceManager(false);
+			var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
 
 			var stringPropertyElement = root.XPathSelectElement("//xsd:element[@name='ModifiedStringProperty']", nm);
 			Assert.IsNotNull(stringPropertyElement);
@@ -1240,7 +1240,7 @@ public async Task CheckDefaultValueAttributesServiceWsdl()
 			Assert.IsFalse(wsdl.Contains("name=\"\""));
 
 			var root = XElement.Parse(wsdl);
-			var nm = Namespaces.CreateDefaultXmlNamespaceManager(false);
+			var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
 
 			var booleanWithNoDefaultPropertyElement = root.XPathSelectElement("//xsd:element[@name='BooleanWithNoDefaultProperty' and @minOccurs='1' and @maxOccurs='1' and not(@default)]", nm);
 			Assert.IsNotNull(booleanWithNoDefaultPropertyElement);
@@ -1280,7 +1280,7 @@ public async Task CheckDataContractKnownTypeAttributeServiceWsdl()
 			Assert.IsFalse(wsdl.Contains("name=\"\""));
 
 			var root = XElement.Parse(wsdl);
-			var nm = Namespaces.CreateDefaultXmlNamespaceManager(false);
+			var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
 
 			var schemaElement = root.XPathSelectElement("//xsd:schema[@targetNamespace='http://schemas.datacontract.org/2004/07/SoapCore.Tests.Model']", nm);
 			Assert.IsNotNull(schemaElement);
@@ -1300,7 +1300,7 @@ public void CheckComplexBaseTypeServiceWsdl()
 			Assert.IsNotNull(wsdl);
 
 			var root = XElement.Parse(wsdl);
-			var nm = Namespaces.CreateDefaultXmlNamespaceManager(false);
+			var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
 
 			var derivedTypeContent = root.XPathSelectElement("//xsd:complexType[@name='DerivedType']/xsd:complexContent[@mixed='false']/xsd:extension[@base='tns:BaseType']/xsd:sequence/xsd:element[@name='DerivedName' and @type='xsd:string' and not(@nillable)]", nm);
 			Assert.IsNotNull(derivedTypeContent);
@@ -1370,7 +1370,7 @@ public void CheckSchemeOverride()
 			Assert.IsNotNull(wsdl);
 
 			var root = XElement.Parse(wsdl);
-			var nm = Namespaces.CreateDefaultXmlNamespaceManager(false);
+			var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false);
 
 			var addressElement = GetElements(root, _soapSchema + "address").SingleOrDefault(a => a.Attribute("location")?.Value.StartsWith("https") == true);
 			Assert.IsNotNull(addressElement);
@@ -1417,18 +1417,18 @@ private async Task<string> GetWsdlFromMetaBodyWriter<T>(SoapSerializer serialize
 		{
 			var service = new ServiceDescription(typeof(T), false);
 			var baseUrl = "http://tempuri.org/";
-			var xmlNamespaceManager = Namespaces.CreateDefaultXmlNamespaceManager(useMicrosoftGuid);
-			xmlNamespaceManager.AddNamespace("tns", service.GeneralContract.Namespace);
+			var xmlNamespaceLookup = Namespaces.CreateDefaultXmlNamespaceLookup(useMicrosoftGuid);
+			xmlNamespaceLookup.AddNamespace("tns", service.GeneralContract.Namespace);
 			var defaultBindingName = !string.IsNullOrWhiteSpace(bindingName) ? bindingName : "BasicHttpBinding";
 			var bodyWriter = serializer == SoapSerializer.DataContractSerializer
 				? new MetaWCFBodyWriter(service, baseUrl, defaultBindingName, false, new[] { new SoapBindingInfo(MessageVersion.None, bindingName, portName) }, new DefaultWsdlOperationNameGenerator()) as BodyWriter
-				: new MetaBodyWriter(service, baseUrl, xmlNamespaceManager, defaultBindingName, new[] { new SoapBindingInfo(MessageVersion.None, bindingName, portName) }, useMicrosoftGuid, new DefaultWsdlOperationNameGenerator()) as BodyWriter;
+				: new MetaBodyWriter(service, baseUrl, xmlNamespaceLookup, defaultBindingName, new[] { new SoapBindingInfo(MessageVersion.None, bindingName, portName) }, useMicrosoftGuid, new DefaultWsdlOperationNameGenerator()) as BodyWriter;
 			var encoder = new SoapMessageEncoder(MessageVersion.Soap12WSAddressingAugust2004, Encoding.UTF8, false, XmlDictionaryReaderQuotas.Max, false, false, null, bindingName, portName, true);
 			var responseMessage = Message.CreateMessage(encoder.MessageVersion, null, bodyWriter);
 			responseMessage = new MetaMessage(
 				responseMessage,
 				service,
-				xmlNamespaceManager,
+				xmlNamespaceLookup,
 				defaultBindingName,
 				false,
 				[responseMessage.Version]);
diff --git a/src/SoapCore/ConcurrentXmlNamespaceLookup.cs b/src/SoapCore/ConcurrentXmlNamespaceLookup.cs
@@ -0,0 +1,29 @@
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Xml;
+
+namespace SoapCore;
+
+public class ConcurrentXmlNamespaceLookup
+{
+	private readonly ConcurrentDictionary<string, string> _uriToPrefix = new ();
+	private readonly ConcurrentDictionary<string, string> _prefixToUri = new ();
+
+	public IDictionary<string, string> GetNamespacesInScope(XmlNamespaceScope scope) => ToXmlNamespaceManager().GetNamespacesInScope(scope);
+	public string LookupPrefix(string uri) => _uriToPrefix.TryGetValue(uri, out var r) ? r : null;
+	public string LookupNamespace(string prefix) => _prefixToUri.TryGetValue(prefix, out var r) ? r : null;
+	public void AddNamespace(string prefix, string uri)
+	{
+		_uriToPrefix.AddOrUpdate(uri, _ => prefix, (_, _) => prefix);
+		_prefixToUri.AddOrUpdate(prefix, _ => uri, (_, _) => uri);
+	}
+	public XmlNamespaceManager ToXmlNamespaceManager()
+	{
+		var r = new XmlNamespaceManager(new NameTable());
+		foreach (var e in _prefixToUri)
+		{
+			r.AddNamespace(e.Key, e.Value);
+		}
+		return r;
+	}
+}
diff --git a/src/SoapCore/CustomMessage.cs b/src/SoapCore/CustomMessage.cs
@@ -16,7 +16,7 @@ public CustomMessage(Message message)
 
 		public Message Message { get; internal set; }
 
-		public XmlNamespaceManager NamespaceManager { get; internal set; }
+		public ConcurrentXmlNamespaceLookup XmlNamespaceLookup { get; internal set; }
 
 		public System.Collections.Generic.Dictionary<string, string> AdditionalEnvelopeXmlnsAttributes { get; internal set; }
 
@@ -43,14 +43,14 @@ protected override void OnWriteStartEnvelope(XmlDictionaryWriter writer)
 				writer.WriteStartDocument();
 			}
 
-			var prefix = Version.Envelope.NamespacePrefix(NamespaceManager);
+			var prefix = Version.Envelope.NamespacePrefix(XmlNamespaceLookup);
 			writer.WriteStartElement(prefix, "Envelope", Version.Envelope.Namespace());
 			writer.WriteXmlnsAttribute(prefix, Version.Envelope.Namespace());
 
-			var xsdPrefix = Namespaces.AddNamespaceIfNotAlreadyPresentAndGetPrefix(NamespaceManager, "xsd", Namespaces.XMLNS_XSD);
+			var xsdPrefix = Namespaces.AddNamespaceIfNotAlreadyPresentAndGetPrefix(XmlNamespaceLookup, "xsd", Namespaces.XMLNS_XSD);
 			writer.WriteXmlnsAttribute(xsdPrefix, Namespaces.XMLNS_XSD);
 
-			var xsiPrefix = Namespaces.AddNamespaceIfNotAlreadyPresentAndGetPrefix(NamespaceManager, "xsi", Namespaces.XMLNS_XSI);
+			var xsiPrefix = Namespaces.AddNamespaceIfNotAlreadyPresentAndGetPrefix(XmlNamespaceLookup, "xsi", Namespaces.XMLNS_XSI);
 			writer.WriteXmlnsAttribute(xsiPrefix, Namespaces.XMLNS_XSI);
 
 			if (AdditionalEnvelopeXmlnsAttributes != null)
@@ -64,12 +64,12 @@ protected override void OnWriteStartEnvelope(XmlDictionaryWriter writer)
 
 		protected override void OnWriteStartHeaders(XmlDictionaryWriter writer)
 		{
-			writer.WriteStartElement(Version.Envelope.NamespacePrefix(NamespaceManager), "Header", Version.Envelope.Namespace());
+			writer.WriteStartElement(Version.Envelope.NamespacePrefix(XmlNamespaceLookup), "Header", Version.Envelope.Namespace());
 		}
 
 		protected override void OnWriteStartBody(XmlDictionaryWriter writer)
 		{
-			writer.WriteStartElement(Version.Envelope.NamespacePrefix(NamespaceManager), "Body", Version.Envelope.Namespace());
+			writer.WriteStartElement(Version.Envelope.NamespacePrefix(XmlNamespaceLookup), "Body", Version.Envelope.Namespace());
 		}
 
 		protected override void OnWriteBodyContents(XmlDictionaryWriter writer)
diff --git a/src/SoapCore/DefaultFaultExceptionTransformer.cs b/src/SoapCore/DefaultFaultExceptionTransformer.cs
@@ -25,7 +25,7 @@ public DefaultFaultExceptionTransformer(ExceptionTransformer exceptionTransforme
 			_exceptionTransformer = exceptionTransformer;
 		}
 
-		public Message ProvideFault(Exception exception, MessageVersion messageVersion, Message requestMessage, XmlNamespaceManager xmlNamespaceManager)
+		public Message ProvideFault(Exception exception, MessageVersion messageVersion, Message requestMessage, ConcurrentXmlNamespaceLookup xmlNamespaceLookup)
 		{
 			var bodyWriter = _exceptionTransformer == null ?
 				new FaultBodyWriter(exception, messageVersion) :
@@ -36,7 +36,7 @@ public Message ProvideFault(Exception exception, MessageVersion messageVersion,
 			T_MESSAGE customMessage = new T_MESSAGE
 			{
 				Message = soapCoreFaultMessage,
-				NamespaceManager = xmlNamespaceManager
+				XmlNamespaceLookup = xmlNamespaceLookup
 			};
 
 			return customMessage;
diff --git a/src/SoapCore/EnvelopeVersionExtentions.cs b/src/SoapCore/EnvelopeVersionExtentions.cs
@@ -15,7 +15,7 @@ public static string Namespace(this EnvelopeVersion envelopeVersion)
 			return Namespaces.SOAP12_ENVELOPE_NS;
 		}
 
-		public static string NamespacePrefix(this EnvelopeVersion envelopeVersion, XmlNamespaceManager namespaces)
+		public static string NamespacePrefix(this EnvelopeVersion envelopeVersion, ConcurrentXmlNamespaceLookup namespaces)
 		{
 			string prefix;
 			if (envelopeVersion == EnvelopeVersion.Soap11)
diff --git a/src/SoapCore/Extensibility/IFaultExceptionTransformer.cs b/src/SoapCore/Extensibility/IFaultExceptionTransformer.cs
@@ -19,9 +19,9 @@ public interface IFaultExceptionTransformer
 		/// <param name="exception">Exception to transform</param>
 		/// <param name="messageVersion">SOAP message version</param>
 		/// <param name="requestMessage">SOAP requestMessage</param>
-		/// <param name="xmlNamespaceManager">Namespace manager</param>
+		/// <param name="xmlNamespaceLookup">Namespace manager</param>
 		/// <returns>Fully formatted SOAP Message</returns>
 		/// <seealso cref="MessageFaultBodyWriter"/>
-		Message ProvideFault(Exception exception, MessageVersion messageVersion, Message requestMessage, XmlNamespaceManager xmlNamespaceManager);
+		Message ProvideFault(Exception exception, MessageVersion messageVersion, Message requestMessage, ConcurrentXmlNamespaceLookup xmlNamespaceLookup);
 	}
 }
diff --git a/src/SoapCore/Meta/BodyWriterExtensions.cs b/src/SoapCore/Meta/BodyWriterExtensions.cs
@@ -15,7 +15,7 @@ public static class BodyWriterExtensions
 		//switches to easily revert to previous behaviour if there is a problem
 		private static readonly bool UseXmlSchemaProvider = true;
 		private static readonly bool UseXmlReflectionImporter = false;
-		public static bool TryAddSchemaTypeFromXmlSchemaProviderAttribute(this XmlDictionaryWriter writer, Type type, string name, SoapSerializer serializer, XmlNamespaceManager xmlNamespaceManager = null, bool isUnqualified = false)
+		public static bool TryAddSchemaTypeFromXmlSchemaProviderAttribute(this XmlDictionaryWriter writer, Type type, string name, SoapSerializer serializer, ConcurrentXmlNamespaceLookup xmlNamespaceLookup = null, bool isUnqualified = false)
 		{
 			if (!UseXmlSchemaProvider && !UseXmlReflectionImporter)
 			{
@@ -47,14 +47,14 @@ public static bool TryAddSchemaTypeFromXmlSchemaProviderAttribute(this XmlDictio
 				return true;
 			}
 
-			var xmlSchemaSet = xmlNamespaceManager == null ? new XmlSchemaSet() : new XmlSchemaSet(xmlNamespaceManager.NameTable);
+			var xmlSchemaSet = xmlNamespaceLookup == null ? new XmlSchemaSet() : new XmlSchemaSet(xmlNamespaceLookup.ToXmlNamespaceManager().NameTable);
 			var xmlSchemaProviderAttribute = type.GetCustomAttribute<XmlSchemaProviderAttribute>(true);
 			if (xmlSchemaProviderAttribute != null && true)
 			{
 				XmlSchema schema = new XmlSchema();
-				if (xmlNamespaceManager != null)
+				if (xmlNamespaceLookup != null)
 				{
-					schema.Namespaces = xmlNamespaceManager.Convert();
+					schema.Namespaces = xmlNamespaceLookup.Convert();
 				}
 
 				if (xmlSchemaProviderAttribute.IsAny)
@@ -246,10 +246,10 @@ private static string GetArrayTypeName(string typeName, bool isNullable)
 			return "ArrayOf" + (isNullable ? "Nullable" : null) + (ClrTypeResolver.ResolveOrDefault(typeName) ?? typeName).FirstCharToUpperOrDefault();
 		}
 
-		private static XmlSerializerNamespaces Convert(this XmlNamespaceManager xmlNamespaceManager)
+		private static XmlSerializerNamespaces Convert(this ConcurrentXmlNamespaceLookup xmlNamespaceLookup)
 		{
 			XmlSerializerNamespaces xmlSerializerNamespaces = new XmlSerializerNamespaces();
-			foreach (var ns in xmlNamespaceManager.GetNamespacesInScope(XmlNamespaceScope.Local))
+			foreach (var ns in xmlNamespaceLookup.GetNamespacesInScope(XmlNamespaceScope.Local))
 			{
 				xmlSerializerNamespaces.Add(ns.Key, ns.Value);
 			}
diff --git a/src/SoapCore/Meta/MetaBodyWriter.cs b/src/SoapCore/Meta/MetaBodyWriter.cs
diff --git a/src/SoapCore/Meta/MetaMessage.cs b/src/SoapCore/Meta/MetaMessage.cs
diff --git a/src/SoapCore/Namespaces.cs b/src/SoapCore/Namespaces.cs
diff --git a/src/SoapCore/SoapEndpointMiddleware.cs b/src/SoapCore/SoapEndpointMiddleware.cs

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace SoapCore.Tests.FaultExceptionTransformer`
`9`	`9`	`{`
`10`	`10`	`public class TestFaultExceptionTransformer : IFaultExceptionTransformer`
`11`	`11`	`{`
`12`		`- public Message ProvideFault(Exception exception, MessageVersion messageVersion, Message requestMessage, XmlNamespaceManager xmlNamespaceManager)`
	`12`	`+ public Message ProvideFault(Exception exception, MessageVersion messageVersion, Message requestMessage, ConcurrentXmlNamespaceLookup xmlNamespaceLookup)`
`13`	`13`	`{`
`14`	`14`	`var fault = new TestFault`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public CustomMessage(Message message)`
`16`	`16`
`17`	`17`	`public Message Message { get; internal set; }`
`18`	`18`
`19`		`- public XmlNamespaceManager NamespaceManager { get; internal set; }`
	`19`	`+ public ConcurrentXmlNamespaceLookup XmlNamespaceLookup { get; internal set; }`
`20`	`20`
`21`	`21`	`public System.Collections.Generic.Dictionary<string, string> AdditionalEnvelopeXmlnsAttributes { get; internal set; }`
`22`	`22`
`@@ -43,14 +43,14 @@ protected override void OnWriteStartEnvelope(XmlDictionaryWriter writer)`
`43`	`43`	`writer.WriteStartDocument();`
`44`	`44`	`}`
`45`	`45`
`46`		`- var prefix = Version.Envelope.NamespacePrefix(NamespaceManager);`
	`46`	`+ var prefix = Version.Envelope.NamespacePrefix(XmlNamespaceLookup);`
`47`	`47`	`writer.WriteStartElement(prefix, "Envelope", Version.Envelope.Namespace());`
`48`	`48`	`writer.WriteXmlnsAttribute(prefix, Version.Envelope.Namespace());`
`49`	`49`
`50`		`- var xsdPrefix = Namespaces.AddNamespaceIfNotAlreadyPresentAndGetPrefix(NamespaceManager, "xsd", Namespaces.XMLNS_XSD);`
	`50`	`+ var xsdPrefix = Namespaces.AddNamespaceIfNotAlreadyPresentAndGetPrefix(XmlNamespaceLookup, "xsd", Namespaces.XMLNS_XSD);`
`51`	`51`	`writer.WriteXmlnsAttribute(xsdPrefix, Namespaces.XMLNS_XSD);`
`52`	`52`
`53`		`- var xsiPrefix = Namespaces.AddNamespaceIfNotAlreadyPresentAndGetPrefix(NamespaceManager, "xsi", Namespaces.XMLNS_XSI);`
	`53`	`+ var xsiPrefix = Namespaces.AddNamespaceIfNotAlreadyPresentAndGetPrefix(XmlNamespaceLookup, "xsi", Namespaces.XMLNS_XSI);`
`54`	`54`	`writer.WriteXmlnsAttribute(xsiPrefix, Namespaces.XMLNS_XSI);`
`55`	`55`
`56`	`56`	`if (AdditionalEnvelopeXmlnsAttributes != null)`
`@@ -64,12 +64,12 @@ protected override void OnWriteStartEnvelope(XmlDictionaryWriter writer)`
`64`	`64`
`65`	`65`	`protected override void OnWriteStartHeaders(XmlDictionaryWriter writer)`
`66`	`66`	`{`
`67`		`- writer.WriteStartElement(Version.Envelope.NamespacePrefix(NamespaceManager), "Header", Version.Envelope.Namespace());`
	`67`	`+ writer.WriteStartElement(Version.Envelope.NamespacePrefix(XmlNamespaceLookup), "Header", Version.Envelope.Namespace());`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`protected override void OnWriteStartBody(XmlDictionaryWriter writer)`
`71`	`71`	`{`
`72`		`- writer.WriteStartElement(Version.Envelope.NamespacePrefix(NamespaceManager), "Body", Version.Envelope.Namespace());`
	`72`	`+ writer.WriteStartElement(Version.Envelope.NamespacePrefix(XmlNamespaceLookup), "Body", Version.Envelope.Namespace());`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`protected override void OnWriteBodyContents(XmlDictionaryWriter writer)`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public DefaultFaultExceptionTransformer(ExceptionTransformer exceptionTransforme`
`25`	`25`	`_exceptionTransformer = exceptionTransformer;`
`26`	`26`	`}`
`27`	`27`
`28`		`- public Message ProvideFault(Exception exception, MessageVersion messageVersion, Message requestMessage, XmlNamespaceManager xmlNamespaceManager)`
	`28`	`+ public Message ProvideFault(Exception exception, MessageVersion messageVersion, Message requestMessage, ConcurrentXmlNamespaceLookup xmlNamespaceLookup)`
`29`	`29`	`{`
`30`	`30`	`var bodyWriter = _exceptionTransformer == null ?`
`31`	`31`	`new FaultBodyWriter(exception, messageVersion) :`
`@@ -36,7 +36,7 @@ public Message ProvideFault(Exception exception, MessageVersion messageVersion,`
`36`	`36`	`T_MESSAGE customMessage = new T_MESSAGE`
`37`	`37`	`{`
`38`	`38`	`Message = soapCoreFaultMessage,`
`39`		`- NamespaceManager = xmlNamespaceManager`
	`39`	`+ XmlNamespaceLookup = xmlNamespaceLookup`
`40`	`40`	`};`
`41`	`41`
`42`	`42`	`return customMessage;`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public static string Namespace(this EnvelopeVersion envelopeVersion)`
`15`	`15`	`return Namespaces.SOAP12_ENVELOPE_NS;`
`16`	`16`	`}`
`17`	`17`
`18`		`- public static string NamespacePrefix(this EnvelopeVersion envelopeVersion, XmlNamespaceManager namespaces)`
	`18`	`+ public static string NamespacePrefix(this EnvelopeVersion envelopeVersion, ConcurrentXmlNamespaceLookup namespaces)`
`19`	`19`	`{`
`20`	`20`	`string prefix;`
`21`	`21`	`if (envelopeVersion == EnvelopeVersion.Soap11)`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@ public interface IFaultExceptionTransformer`
`19`	`19`	`/// <param name="exception">Exception to transform</param>`
`20`	`20`	`/// <param name="messageVersion">SOAP message version</param>`
`21`	`21`	`/// <param name="requestMessage">SOAP requestMessage</param>`
`22`		`- /// <param name="xmlNamespaceManager">Namespace manager</param>`
	`22`	`+ /// <param name="xmlNamespaceLookup">Namespace manager</param>`
`23`	`23`	`/// <returns>Fully formatted SOAP Message</returns>`
`24`	`24`	`/// <seealso cref="MessageFaultBodyWriter"/>`
`25`		`- Message ProvideFault(Exception exception, MessageVersion messageVersion, Message requestMessage, XmlNamespaceManager xmlNamespaceManager);`
	`25`	`+ Message ProvideFault(Exception exception, MessageVersion messageVersion, Message requestMessage, ConcurrentXmlNamespaceLookup xmlNamespaceLookup);`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public static class BodyWriterExtensions`
`15`	`15`	`//switches to easily revert to previous behaviour if there is a problem`
`16`	`16`	`private static readonly bool UseXmlSchemaProvider = true;`
`17`	`17`	`private static readonly bool UseXmlReflectionImporter = false;`
`18`		`- public static bool TryAddSchemaTypeFromXmlSchemaProviderAttribute(this XmlDictionaryWriter writer, Type type, string name, SoapSerializer serializer, XmlNamespaceManager xmlNamespaceManager = null, bool isUnqualified = false)`
	`18`	`+ public static bool TryAddSchemaTypeFromXmlSchemaProviderAttribute(this XmlDictionaryWriter writer, Type type, string name, SoapSerializer serializer, ConcurrentXmlNamespaceLookup xmlNamespaceLookup = null, bool isUnqualified = false)`
`19`	`19`	`{`
`20`	`20`	`if (!UseXmlSchemaProvider && !UseXmlReflectionImporter)`
`21`	`21`	`{`
`@@ -47,14 +47,14 @@ public static bool TryAddSchemaTypeFromXmlSchemaProviderAttribute(this XmlDictio`
`47`	`47`	`return true;`
`48`	`48`	`}`
`49`	`49`
`50`		`- var xmlSchemaSet = xmlNamespaceManager == null ? new XmlSchemaSet() : new XmlSchemaSet(xmlNamespaceManager.NameTable);`
	`50`	`+ var xmlSchemaSet = xmlNamespaceLookup == null ? new XmlSchemaSet() : new XmlSchemaSet(xmlNamespaceLookup.ToXmlNamespaceManager().NameTable);`
`51`	`51`	`var xmlSchemaProviderAttribute = type.GetCustomAttribute<XmlSchemaProviderAttribute>(true);`
`52`	`52`	`if (xmlSchemaProviderAttribute != null && true)`
`53`	`53`	`{`
`54`	`54`	`XmlSchema schema = new XmlSchema();`
`55`		`- if (xmlNamespaceManager != null)`
	`55`	`+ if (xmlNamespaceLookup != null)`
`56`	`56`	`{`
`57`		`- schema.Namespaces = xmlNamespaceManager.Convert();`
	`57`	`+ schema.Namespaces = xmlNamespaceLookup.Convert();`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`if (xmlSchemaProviderAttribute.IsAny)`
`@@ -246,10 +246,10 @@ private static string GetArrayTypeName(string typeName, bool isNullable)`
`246`	`246`	`return "ArrayOf" + (isNullable ? "Nullable" : null) + (ClrTypeResolver.ResolveOrDefault(typeName) ?? typeName).FirstCharToUpperOrDefault();`
`247`	`247`	`}`
`248`	`248`
`249`		`- private static XmlSerializerNamespaces Convert(this XmlNamespaceManager xmlNamespaceManager)`
	`249`	`+ private static XmlSerializerNamespaces Convert(this ConcurrentXmlNamespaceLookup xmlNamespaceLookup)`
`250`	`250`	`{`
`251`	`251`	`XmlSerializerNamespaces xmlSerializerNamespaces = new XmlSerializerNamespaces();`
`252`		`- foreach (var ns in xmlNamespaceManager.GetNamespacesInScope(XmlNamespaceScope.Local))`
	`252`	`+ foreach (var ns in xmlNamespaceLookup.GetNamespacesInScope(XmlNamespaceScope.Local))`
`253`	`253`	`{`
`254`	`254`	`xmlSerializerNamespaces.Add(ns.Key, ns.Value);`
`255`	`255`	`}`