Imported Upstream version 4.6.0.182

Former-commit-id: 439c182e520038bf50777ca2fe684f216ae28552
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-09-01 10:46:18 +00:00
parent c911219690
commit 804b15604f
118 changed files with 1007 additions and 891 deletions

View File

@ -98,29 +98,29 @@ namespace System.ServiceModel.Channels
}
public TChannel CreateChannel (
EndpointAddress remoteAddress)
EndpointAddress address)
{
if (remoteAddress == null)
throw new ArgumentNullException ("remoteAddress");
return CreateChannel (remoteAddress, remoteAddress.Uri);
if (address == null)
throw new ArgumentNullException ("address");
return CreateChannel (address, address.Uri);
}
public TChannel CreateChannel (
EndpointAddress remoteAddress, Uri via)
EndpointAddress address, Uri via)
{
if (remoteAddress == null)
throw new ArgumentNullException ("remoteAddress");
if (address == null)
throw new ArgumentNullException ("address");
if (via == null)
throw new ArgumentNullException ("via");
ValidateCreateChannel ();
var ch = OnCreateChannel (remoteAddress, via);
var ch = OnCreateChannel (address, via);
channels.Add (ch);
return ch;
}
protected abstract TChannel OnCreateChannel (
EndpointAddress remoteAddress, Uri via);
EndpointAddress address, Uri via);
protected override void OnAbort ()
{