Merge pull request #3248 from esdrubal/web_request_abort

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

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageEncodingBindingElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageEncodingBindingElement.cs
index 12380cce602d8ade27e956ee55230c992baf35bf..49a8478f6f98af7b61a9254940ec6df38bb958b3 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageEncodingBindingElement.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageEncodingBindingElement.cs
@@ -35,12 +35,14 @@ namespace System.ServiceModel.Channels
 {
        public abstract class MessageEncodingBindingElement : BindingElement
        {
-               public MessageEncodingBindingElement ()
+               public
+               MessageEncodingBindingElement ()
                {
                }
 
                [MonoTODO]
-               public MessageEncodingBindingElement (MessageEncodingBindingElement source)
+               public
+               MessageEncodingBindingElement (MessageEncodingBindingElement source)
                {
                        MessageVersion = source.MessageVersion;
                }
@@ -50,7 +52,14 @@ namespace System.ServiceModel.Channels
 
                public abstract MessageVersion MessageVersion { get; set; }
 
-#if !NET_2_1
+               public override T GetProperty<T> (BindingContext ctx)
+               {
+                       if (typeof (T) == typeof (MessageVersion))
+                               return (T) (object) MessageVersion;
+                       return ctx.GetInnerProperty<T> ();
+               }
+
+#if !NET_2_1 && !XAMMAC_4_5
                [MonoTODO]
                protected virtual void OnImportPolicy (XmlElement assertion,
                        MessageVersion messageVersion,