Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900

mcs/class/System.ServiceModel/System.ServiceModel.Channels/Binding.cs

@@ -176,7 +176,7 @@ namespace System.ServiceModel.Channels
 
 		public virtual IChannelListener<TChannel>
 			BuildChannelListener<TChannel> (
-			Uri listenUri,
+			Uri listenUriBaseAddress,
 			params object [] parameters)
 			where TChannel : class, IChannel
 		{
@@ -184,16 +184,16 @@ namespace System.ServiceModel.Channels
 				new BindingParameterCollection ();
 			foreach (object o in parameters)
 				pl.Add (o);
-			return BuildChannelListener<TChannel> (listenUri, pl);
+			return BuildChannelListener<TChannel> (listenUriBaseAddress, pl);
 		}
 
 		public virtual IChannelListener<TChannel>
 			BuildChannelListener<TChannel> (
-			Uri listenUri,
+			Uri listenUriBaseAddress,
 			BindingParameterCollection parameters)
 			where TChannel : class, IChannel
 		{
-			return BuildChannelListener<TChannel> (listenUri,
+			return BuildChannelListener<TChannel> (listenUriBaseAddress,
 				String.Empty, parameters);
 		}
 

mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelListenerBase_1.cs

@@ -197,16 +197,16 @@ namespace System.ServiceModel.Channels
 		}
 
 		public IAsyncResult BeginAcceptChannel (
-			AsyncCallback callback, object asyncState)
+			AsyncCallback callback, object state)
 		{
 			return BeginAcceptChannel (
-				timeouts.ReceiveTimeout, callback, asyncState);
+				timeouts.ReceiveTimeout, callback, state);
 		}
 
 		public IAsyncResult BeginAcceptChannel (TimeSpan timeout,
-			AsyncCallback callback, object asyncState)
+			AsyncCallback callback, object state)
 		{
-			return OnBeginAcceptChannel (timeout, callback, asyncState);
+			return OnBeginAcceptChannel (timeout, callback, state);
 		}
 
 		public TChannel EndAcceptChannel (IAsyncResult result)
@@ -217,7 +217,7 @@ namespace System.ServiceModel.Channels
 		protected abstract TChannel OnAcceptChannel (TimeSpan timeout);
 
 		protected abstract IAsyncResult OnBeginAcceptChannel (TimeSpan timeout,
-			AsyncCallback callback, object asyncState);
+			AsyncCallback callback, object state);
 
 		protected abstract TChannel OnEndAcceptChannel (IAsyncResult result);
 	}

mcs/class/System.ServiceModel/System.ServiceModel.Channels/CustomBinding.cs

@@ -43,8 +43,8 @@ namespace System.ServiceModel.Channels
 		ISecurityCapabilities security;
 		string scheme = "";
 
-		public CustomBinding (string name)
-			: this (name, default_ns)
+		public CustomBinding (string configurationName)
+			: this (configurationName, default_ns)
 		{
 		}
 

mcs/class/System.ServiceModel/System.ServiceModel.Channels/Message.cs

@@ -334,19 +334,19 @@ namespace System.ServiceModel.Channels
 
 		// 1)
 		public static Message CreateMessage (MessageVersion version,
-			FaultCode code, string reason, string action)
+			FaultCode faultCode, string reason, string action)
 		{
-			MessageFault fault = MessageFault.CreateFault (code, reason);
+			MessageFault fault = MessageFault.CreateFault (faultCode, reason);
 			return CreateMessage (version, fault, action);
 		}
 
 		// 2)
 		public static Message CreateMessage (MessageVersion version,
-			FaultCode code, string reason, object detail,
+			FaultCode faultCode, string reason, object detail,
 			string action)
 		{
 			MessageFault fault = MessageFault.CreateFault (
-				code, new FaultReason (reason), detail);
+				faultCode, new FaultReason (reason), detail);
 			return CreateMessage (version, fault, action);
 		}
 

mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageBuffer.cs

@@ -47,9 +47,9 @@ namespace System.ServiceModel.Channels {
 			return CreateNavigator (XmlSpace.Default);
 		}
 
-		public XPathNavigator CreateNavigator (int node_quota)
+		public XPathNavigator CreateNavigator (int nodeQuota)
 		{
-			return CreateNavigator (node_quota, XmlSpace.Default);
+			return CreateNavigator (nodeQuota, XmlSpace.Default);
 		}
 
 		[MonoTODO ("supply proper quota")]
@@ -60,10 +60,10 @@ namespace System.ServiceModel.Channels {
 		}
 
 		[MonoTODO ("Handle node_quota and xmlspace")]
-		public XPathNavigator CreateNavigator (int node_quota, XmlSpace space)
+		public XPathNavigator CreateNavigator (int nodeQuota, XmlSpace space)
 		{
 			if (nav_cache == null) {
-				DTMXPathDocumentWriter2 pw = new DTMXPathDocumentWriter2 (new NameTable (), node_quota);
+				DTMXPathDocumentWriter2 pw = new DTMXPathDocumentWriter2 (new NameTable (), nodeQuota);
 				XmlDictionaryWriter w = XmlDictionaryWriter.CreateDictionaryWriter (pw);
 				CreateMessage ().WriteMessage (w);
 				nav_cache = pw.CreateDocument ().CreateNavigator ();

mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageFault.cs

@@ -220,26 +220,26 @@ namespace System.ServiceModel.Channels
 
 		public static MessageFault CreateFault (FaultCode code,
 			FaultReason reason, object detail,
-			XmlObjectSerializer formatter)
+			XmlObjectSerializer serializer)
 		{
 			return new SimpleMessageFault (code, reason, true,
-				detail, formatter, String.Empty, String.Empty);
+				detail, serializer, String.Empty, String.Empty);
 		}
 
 		public static MessageFault CreateFault (FaultCode code,
 			FaultReason reason, object detail,
-			XmlObjectSerializer formatter, string actor)
+			XmlObjectSerializer serializer, string actor)
 		{
 			return new SimpleMessageFault (code, reason,
-				true, detail, formatter, actor, String.Empty);
+				true, detail, serializer, actor, String.Empty);
 		}
 
 		public static MessageFault CreateFault (FaultCode code,
 			FaultReason reason, object detail,
-			XmlObjectSerializer formatter, string actor, string node)
+			XmlObjectSerializer serializer, string actor, string node)
 		{
 			return new SimpleMessageFault (code, reason,
-				true, detail, formatter, actor, node);
+				true, detail, serializer, actor, node);
 		}
 
 		// pretty simple implementation class

mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs

@@ -50,10 +50,10 @@ namespace System.ServiceModel.Channels
 			new Dictionary<Type, XmlObjectSerializer> ();
 		MessageVersion version;
 
-		public MessageHeaders (MessageHeaders headers)
-			: this (headers.MessageVersion)
+		public MessageHeaders (MessageHeaders collection)
+			: this (collection.MessageVersion)
 		{
-			CopyHeadersFrom (headers);
+			CopyHeadersFrom (collection);
 		}
 
 		public MessageHeaders (MessageVersion version)
@@ -61,10 +61,10 @@ namespace System.ServiceModel.Channels
 		{
 		}
 
-		public MessageHeaders (MessageVersion version, int capacity)
+		public MessageHeaders (MessageVersion version, int initialSize)
 		{
 			this.version = version;
-			l = new List<MessageHeaderInfo> (capacity);
+			l = new List<MessageHeaderInfo> (initialSize);
 		}
 		
 		public void Add (MessageHeader header)

mcs/class/System.ServiceModel/System.ServiceModel.Channels/MtomMessageEncodingBindingElement.cs

@@ -49,10 +49,10 @@ namespace System.ServiceModel.Channels
 		}
 
 		public MtomMessageEncodingBindingElement (
-			MessageVersion version, Encoding encoding)
+			MessageVersion messageVersion, Encoding writeEncoding)
 		{
-			this.version = version;
-			this.encoding = encoding;
+			this.version = messageVersion;
+			this.encoding = writeEncoding;
 		}
 
 		public int MaxBufferSize {

mcs/class/System.ServiceModel/System.ServiceModel.Channels/NamedPipetransportBindingElement.cs

@@ -41,10 +41,10 @@ namespace System.ServiceModel.Channels
 		}
 
 		protected NamedPipeTransportBindingElement (
-			NamedPipeTransportBindingElement other)
-			: base (other)
+			NamedPipeTransportBindingElement elementToBeCloned)
+			: base (elementToBeCloned)
 		{
-			pool.CopyPropertiesFrom (other.pool);
+			pool.CopyPropertiesFrom (elementToBeCloned.pool);
 		}
 
 		NamedPipeConnectionPoolSettings pool = new NamedPipeConnectionPoolSettings ();

mcs/class/System.ServiceModel/System.ServiceModel.Channels/StreamUpgradeBindingElement.cs

@@ -37,7 +37,7 @@ namespace System.ServiceModel.Channels
 		{
 		}
 
-		protected StreamUpgradeBindingElement (StreamUpgradeBindingElement other)
+		protected StreamUpgradeBindingElement (StreamUpgradeBindingElement elementToBeCloned)
 		{
 		}
 

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 {

mcs/class/System.ServiceModel/System.ServiceModel.Channels/UnderstoodHeaders.cs

@@ -40,14 +40,14 @@ namespace System.ServiceModel.Channels
 		{
 			headers = new List<MessageHeaderInfo> ();
 		}
-		public void Add (MessageHeaderInfo header)
+		public void Add (MessageHeaderInfo headerInfo)
 		{
-			headers.Add (header);
+			headers.Add (headerInfo);
 		}
 
-		public bool Contains (MessageHeaderInfo header)
+		public bool Contains (MessageHeaderInfo headerInfo)
 		{
-			return headers.Contains (header);
+			return headers.Contains (headerInfo);
 		}
 
 		public IEnumerator<MessageHeaderInfo> GetEnumerator ()
@@ -55,9 +55,9 @@ namespace System.ServiceModel.Channels
 			return headers.GetEnumerator ();
 		}
 
-		public void Remove (MessageHeaderInfo header)
+		public void Remove (MessageHeaderInfo headerInfo)
 		{
-			headers.Remove (header);
+			headers.Remove (headerInfo);
 		}
 
 		IEnumerator IEnumerable.GetEnumerator ()