Merge pull request #1139 from andersjonsson/fix-onwritebodycontents

Fix onwritebodycontents

Author: andersjonsson

src/SoapCore.Tests/XDocumentXmlReaderTests.cs

@@ -3,8 +3,10 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.ServiceModel.Channels;
 using System.Text;
 using System.Threading.Tasks;
+using System.Xml;
 using System.Xml.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -52,5 +54,24 @@ public void TestReadBase64()
 
 			Assert.AreEqual(1336, ms.Length);
 		}
+
+		[TestMethod]
+		public async Task WriteTwice()
+		{
+			var body = $@"<soapenv:Envelope xmlns:soapenv=""http://schemas.xmlsoap.org/soap/envelope/"">
+  <soapenv:Body>
+    <Ping xmlns=""http://tempuri.org/"">
+      <s>1</s>
+    </Ping>
+  </soapenv:Body>
+</soapenv:Envelope>
+";
+			ParsedMessage pm = await ParsedMessage.FromStreamReaderAsync(new StreamReader(new MemoryStream(Encoding.Default.GetBytes(body))), MessageVersion.Soap12);
+
+			var dw = XmlDictionaryWriter.CreateDictionaryWriter(XmlWriter.Create(new MemoryStream()));
+
+			pm.WriteBodyContents(dw);
+			pm.WriteBodyContents(dw);
+		}
 	}
 }

src/SoapCore/ParsedMessage.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.ServiceModel.Channels;
 using System.Text;
 using System.Threading;
@@ -77,13 +78,22 @@ public override string ToString()
 
 		protected override void OnWriteBodyContents(XmlDictionaryWriter writer)
 		{
-			using (var reader = GetReaderAtBodyContents())
+			ResetMessageConsumed();
+
+			using (var reader = InternalGetReaderAtBodyContents())
 			{
 				writer.WriteNode(reader, true);
 			}
 		}
 
 		protected override XmlDictionaryReader OnGetReaderAtBodyContents()
+		{
+			ResetMessageConsumed();
+
+			return InternalGetReaderAtBodyContents();
+		}
+
+		private XmlDictionaryReader InternalGetReaderAtBodyContents()
 		{
 			var reader = new XDocumentXmlReader(_body);
 
@@ -175,5 +185,19 @@ private static MessageProperties ExtractSoapProperties(HttpRequest httpRequest)
 
 			return properties;
 		}
+
+		private void ResetMessageConsumed()
+		{
+			var stateField = typeof(Message).GetProperty("State");
+			if (stateField != null)
+			{
+				// Set the state to 'Created' to allow reuse
+				stateField.SetValue(this, MessageState.Created);
+			}
+			else
+			{
+				throw new InvalidOperationException("Unable to access the internal state field.");
+			}
+		}
 	}
 }

src/SoapCore/SoapCore.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<Description>SOAP protocol middleware for ASP.NET Core</Description>
-		<Version>1.2.1.6</Version>
+		<Version>1.2.1.7</Version>
 		<Authors>Digital Design</Authors>
 		<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;netcoreapp3.1;</TargetFrameworks>
 		<PackageId>SoapCore</PackageId>