Merge pull request #4542 from lateralusX/jlorenss/win-fix-unwind-tramp-reg-aot

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

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TransactionFlowBindingElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TransactionFlowBindingElement.cs
index 28a93f0ded4dba6aabaff4be09e014e8bfcbae69..07356fb41833b902249fd92dc03f58c87c384817 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TransactionFlowBindingElement.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TransactionFlowBindingElement.cs
@@ -45,9 +45,9 @@ namespace System.ServiceModel.Channels
                {
                }
 
-               public TransactionFlowBindingElement (TransactionProtocol protocol)
+               public TransactionFlowBindingElement (TransactionProtocol transactionProtocol)
                {
-                       this.protocol = protocol;
+                       this.protocol = transactionProtocol;
                }
 
                public TransactionProtocol TransactionProtocol {
@@ -62,7 +62,7 @@ namespace System.ServiceModel.Channels
                [MonoTODO]
                public override T GetProperty<T> (BindingContext context)
                {
-                       throw new NotImplementedException ();
+                       return context.GetInnerProperty<T> ();
                }
 
                public override bool CanBuildChannelFactory<TChannel> (BindingContext context)
@@ -161,11 +161,9 @@ namespace System.ServiceModel.Channels
                        this.protocol = protocol;
                }
 
-               internal override KeyedByTypeCollection<object> Properties {
-                       get {
-                               var b = inner_listener as ChannelListenerBase;
-                               return b != null ? b.Properties : base.Properties;
-                       }
+               public override T GetProperty<T> ()
+               {
+                       return inner_listener.GetProperty<T> () ?? base.GetProperty<T> ();
                }
 
                public override Uri Uri {