diff --git a/src/System.Private.ServiceModel/src/Resources/Strings.resx b/src/System.Private.ServiceModel/src/Resources/Strings.resx index b7e6d7426b5..7bf56f6b3b0 100644 --- a/src/System.Private.ServiceModel/src/Resources/Strings.resx +++ b/src/System.Private.ServiceModel/src/Resources/Strings.resx @@ -1350,7 +1350,7 @@ This property sets EnableFaults on the client. To set EnableFaults on the server, use ChannelDispatcher's EnableFaults. - + This property sets ManualAddressing on the client. To set ManualAddressing on the server, use ChannelDispatcher's ManualAddressing. diff --git a/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/ClientWebSocketTransportDuplexSessionChannel.cs b/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/ClientWebSocketTransportDuplexSessionChannel.cs index f641cbeb238..c46244ef6f5 100644 --- a/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/ClientWebSocketTransportDuplexSessionChannel.cs +++ b/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/ClientWebSocketTransportDuplexSessionChannel.cs @@ -27,8 +27,8 @@ internal class ClientWebSocketTransportDuplexSessionChannel : WebSocketTransport private volatile bool _cleanupStarted; private volatile bool _cleanupIdentity; - public ClientWebSocketTransportDuplexSessionChannel(HttpChannelFactory channelFactory, ClientWebSocketFactory connectionFactory, EndpointAddress remoteAddresss, Uri via) - : base(channelFactory, remoteAddresss, via) + public ClientWebSocketTransportDuplexSessionChannel(HttpChannelFactory channelFactory, ClientWebSocketFactory connectionFactory, EndpointAddress remoteAddress, Uri via) + : base(channelFactory, remoteAddress, via) { Contract.Assert(channelFactory != null, "connection factory must be set"); _channelFactory = channelFactory; diff --git a/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/FramingChannels.cs b/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/FramingChannels.cs index a5781b3828d..43e076bd0fd 100644 --- a/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/FramingChannels.cs +++ b/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/FramingChannels.cs @@ -20,16 +20,16 @@ internal abstract class FramingDuplexSessionChannel : TransportDuplexSessionChan private bool _exposeConnectionProperty; private FramingDuplexSessionChannel(ChannelManagerBase manager, IConnectionOrientedTransportFactorySettings settings, - EndpointAddress localAddress, Uri localVia, EndpointAddress remoteAddresss, Uri via, bool exposeConnectionProperty) - : base(manager, settings, localAddress, localVia, remoteAddresss, via) + EndpointAddress localAddress, Uri localVia, EndpointAddress remoteAddress, Uri via, bool exposeConnectionProperty) + : base(manager, settings, localAddress, localVia, remoteAddress, via) { _exposeConnectionProperty = exposeConnectionProperty; } protected FramingDuplexSessionChannel(ChannelManagerBase factory, IConnectionOrientedTransportFactorySettings settings, - EndpointAddress remoteAddresss, Uri via, bool exposeConnectionProperty) + EndpointAddress remoteAddress, Uri via, bool exposeConnectionProperty) : this(factory, settings, s_anonymousEndpointAddress, settings.MessageVersion.Addressing == AddressingVersion.None ? null : new Uri("http://www.w3.org/2005/08/addressing/anonymous"), - remoteAddresss, via, exposeConnectionProperty) + remoteAddress, via, exposeConnectionProperty) { this.Session = FramingConnectionDuplexSession.CreateSession(this, settings.Upgrade); } @@ -182,9 +182,9 @@ internal class ClientFramingDuplexSessionChannel : FramingDuplexSessionChannel private bool _flowIdentity; public ClientFramingDuplexSessionChannel(ChannelManagerBase factory, IConnectionOrientedTransportChannelFactorySettings settings, - EndpointAddress remoteAddresss, Uri via, IConnectionInitiator connectionInitiator, ConnectionPool connectionPool, + EndpointAddress remoteAddress, Uri via, IConnectionInitiator connectionInitiator, ConnectionPool connectionPool, bool exposeConnectionProperty, bool flowIdentity) - : base(factory, settings, remoteAddresss, via, exposeConnectionProperty) + : base(factory, settings, remoteAddress, via, exposeConnectionProperty) { _settings = settings; this.MessageEncoder = settings.MessageEncoderFactory.CreateSessionEncoder(); diff --git a/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/StreamedFramingRequestChannel.cs b/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/StreamedFramingRequestChannel.cs index 05d4343ee45..9e9d380bd8f 100644 --- a/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/StreamedFramingRequestChannel.cs +++ b/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/StreamedFramingRequestChannel.cs @@ -23,8 +23,8 @@ internal class StreamedFramingRequestChannel : RequestChannel private ChannelBinding _channelBindingToken; public StreamedFramingRequestChannel(ChannelManagerBase factory, IConnectionOrientedTransportChannelFactorySettings settings, - EndpointAddress remoteAddresss, Uri via, IConnectionInitiator connectionInitiator, ConnectionPool connectionPool) - : base(factory, remoteAddresss, via, settings.ManualAddressing) + EndpointAddress remoteAddress, Uri via, IConnectionInitiator connectionInitiator, ConnectionPool connectionPool) + : base(factory, remoteAddress, via, settings.ManualAddressing) { _settings = settings; _connectionInitiator = connectionInitiator; diff --git a/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/TransportDuplexSessionChannel.cs b/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/TransportDuplexSessionChannel.cs index fbdda34cc2a..a3244170260 100644 --- a/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/TransportDuplexSessionChannel.cs +++ b/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/TransportDuplexSessionChannel.cs @@ -32,9 +32,9 @@ protected TransportDuplexSessionChannel( ITransportFactorySettings settings, EndpointAddress localAddress, Uri localVia, - EndpointAddress remoteAddresss, + EndpointAddress remoteAddress, Uri via) - : base(manager, remoteAddresss, via, settings.ManualAddressing, settings.MessageVersion) + : base(manager, remoteAddress, via, settings.ManualAddressing, settings.MessageVersion) { _localAddress = localAddress; _localVia = localVia; diff --git a/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/WebSocketTransportDuplexSessionChannel.cs b/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/WebSocketTransportDuplexSessionChannel.cs index 9b746a0ebde..5c2ce948035 100644 --- a/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/WebSocketTransportDuplexSessionChannel.cs +++ b/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/WebSocketTransportDuplexSessionChannel.cs @@ -28,8 +28,8 @@ internal abstract class WebSocketTransportDuplexSessionChannel : TransportDuplex private bool _shouldDisposeWebSocketAfterClosed = true; private Exception _pendingWritingMessageException; - public WebSocketTransportDuplexSessionChannel(HttpChannelFactory channelFactory, EndpointAddress remoteAddresss, Uri via) - : base(channelFactory, channelFactory, EndpointAddress.AnonymousAddress, channelFactory.MessageVersion.Addressing.AnonymousUri, remoteAddresss, via) + public WebSocketTransportDuplexSessionChannel(HttpChannelFactory channelFactory, EndpointAddress remoteAddress, Uri via) + : base(channelFactory, channelFactory, EndpointAddress.AnonymousAddress, channelFactory.MessageVersion.Addressing.AnonymousUri, remoteAddress, via) { Fx.Assert(channelFactory.WebSocketSettings != null, "channelFactory.WebSocketTransportSettings should not be null."); _webSocketSettings = channelFactory.WebSocketSettings; diff --git a/src/System.Private.ServiceModel/src/System/ServiceModel/Dispatcher/ClientRuntime.cs b/src/System.Private.ServiceModel/src/System/ServiceModel/Dispatcher/ClientRuntime.cs index ed8c0e807cd..04c150b1035 100644 --- a/src/System.Private.ServiceModel/src/System/ServiceModel/Dispatcher/ClientRuntime.cs +++ b/src/System.Private.ServiceModel/src/System/ServiceModel/Dispatcher/ClientRuntime.cs @@ -310,7 +310,7 @@ public bool ManualAddressing { if (this.IsOnServer) { - string text = SR.SFxSetManualAddresssingOnChannelDispatcher0; + string text = SR.SFxSetManualAddressingOnChannelDispatcher0; throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(text)); } else diff --git a/src/System.Private.ServiceModel/tests/Common/Infrastructure/ServiceUtilHelper.cs b/src/System.Private.ServiceModel/tests/Common/Infrastructure/ServiceUtilHelper.cs index 94387c1ffd1..6c2b36e61e5 100644 --- a/src/System.Private.ServiceModel/tests/Common/Infrastructure/ServiceUtilHelper.cs +++ b/src/System.Private.ServiceModel/tests/Common/Infrastructure/ServiceUtilHelper.cs @@ -364,7 +364,7 @@ public static bool IISHosted { get { - // We assume the self hosted service does not have test service base addess, only the host name passed + // We assume the self hosted service does not have test service base address, only the host name passed // This will satisfy all current requirements if (TestProperties.GetProperty(TestProperties.ServiceUri_PropertyName).Contains("/")) {