Merge pull request #5198 from BrzVlad/fix-binprot-stats

[mono.git] / mcs / class / System.ServiceModel / System.ServiceModel.Channels / BinaryMessageEncoder.cs

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/BinaryMessageEncoder.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/BinaryMessageEncoder.cs
index d1f6a64e7572882e17fdb947426f598aaea919de..fc379b2e588c954c49948dd5a3c7285d66a6a69f 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/BinaryMessageEncoder.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/BinaryMessageEncoder.cs
@@ -109,16 +109,18 @@ namespace System.ServiceModel.Channels
                                stream = tmpms;
                        }
 
-                       return Message.CreateMessage (
+                       var ret = Message.CreateMessage (
                                XmlDictionaryReader.CreateBinaryReader (stream, Constants.SoapDictionary, owner != null ? owner.Owner.ReaderQuotas : new XmlDictionaryReaderQuotas (), session ? CurrentReaderSession : null),
                                maxSizeOfHeaders, MessageVersion);
+                       ret.Properties.Encoder = this;
+                       return ret;
                }
 
                public override void WriteMessage (Message message, Stream stream)
                {
                        VerifyMessageVersion (message);
 
-                       using (var xw = XmlDictionaryWriter.CreateBinaryWriter (stream, Constants.SoapDictionary, session ? CurrentWriterSession : null))
+                       using (var xw = XmlDictionaryWriter.CreateBinaryWriter (stream, Constants.SoapDictionary, session ? CurrentWriterSession : null, false))
                                message.WriteMessage (xw);
                }