Merge pull request #4621 from alexanderkyte/strdup_env

[mono.git] / mcs / class / System.ServiceModel / System.ServiceModel / ChannelFactory.cs

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs
index 442a33113f543c1ee0fae0fc83a71ec0e4ab94af..d4d00e768cc499a726337e982617cbf2caa73ad5 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs
@@ -85,33 +85,33 @@ namespace System.ServiceModel
                        get { return Endpoint.Binding.OpenTimeout; }
                }
 
-               protected virtual void ApplyConfiguration (string endpointConfig)
+               protected virtual void ApplyConfiguration (string configurationName)
                {
-                       if (endpointConfig == null)
+                       if (configurationName == null)
                                return;
 
-#if NET_2_1
+#if MOBILE || XAMMAC_4_5
                        try {
                                // It should automatically use XmlXapResolver
                                var cfg = new SilverlightClientConfigLoader ().Load (XmlReader.Create ("ServiceReferences.ClientConfig"));
 
                                SilverlightClientConfigLoader.ServiceEndpointConfiguration se = null;
-                               if (endpointConfig == "*")
+                               if (configurationName == "*")
                                        se = cfg.GetServiceEndpointConfiguration (Endpoint.Contract.Name);
                                if (se == null)
-                                       se = cfg.GetServiceEndpointConfiguration (endpointConfig);
+                                       se = cfg.GetServiceEndpointConfiguration (configurationName);
 
                                if (se.Binding != null && Endpoint.Binding == null)
                                        Endpoint.Binding = se.Binding;
                                else // ignore it
-                                       Console.WriteLine ("WARNING: Configured binding not found in configuration {0}", endpointConfig);
+                                       Console.WriteLine ("WARNING: Configured binding not found in configuration {0}", configurationName);
                                if (se.Address != null && Endpoint.Address == null)
                                        Endpoint.Address = se.Address;
                                else // ignore it
-                                       Console.WriteLine ("WARNING: Configured endpoint address not found in configuration {0}", endpointConfig);
+                                       Console.WriteLine ("WARNING: Configured endpoint address not found in configuration {0}", configurationName);
                        } catch (Exception) {
                                // ignore it.
-                               Console.WriteLine ("WARNING: failed to load endpoint configuration for {0}", endpointConfig);
+                               Console.WriteLine ("WARNING: failed to load endpoint configuration for {0}", configurationName);
                        }
 #else
 
@@ -120,7 +120,7 @@ namespace System.ServiceModel
                        ChannelEndpointElement endpoint = null;
 
                        foreach (ChannelEndpointElement el in client.Endpoints) {
-                               if (el.Contract == contractName && (endpointConfig == el.Name || endpointConfig == "*")) {
+                               if (el.Contract == contractName && (configurationName == el.Name || configurationName == "*")) {
                                        if (endpoint != null)
                                                throw new InvalidOperationException (String.Format ("More then one endpoint matching contract {0} was found.", contractName));
                                        endpoint = el;
@@ -128,9 +128,8 @@ namespace System.ServiceModel
                        }
 
                        if (endpoint == null)
-                               throw new InvalidOperationException (String.Format ("Client endpoint configuration '{0}' was not found in {1} endpoints.", endpointConfig, client.Endpoints.Count));
+                               throw new InvalidOperationException (String.Format ("Client endpoint configuration '{0}' was not found in {1} endpoints.", configurationName, client.Endpoints.Count));
 
-#if NET_4_0
                        var binding = String.IsNullOrEmpty (endpoint.Binding) ? null : ConfigUtil.CreateBinding (endpoint.Binding, endpoint.BindingConfiguration);
                        var contractType = ConfigUtil.GetTypeFromConfigString (endpoint.Contract, NamedConfigCategory.Contract);
                        if (contractType == null)
@@ -151,7 +150,6 @@ namespace System.ServiceModel
                                if (binding == null && endpoint.Address != null) // look for protocol mapping
                                        Endpoint.Binding = ConfigUtil.GetBindingByProtocolMapping (endpoint.Address);
                        }
-#endif
                        if (Endpoint.Binding == null)
                                Endpoint.Binding = ConfigUtil.CreateBinding (endpoint.Binding, endpoint.BindingConfiguration);
                        if (Endpoint.Address == null)
@@ -162,7 +160,7 @@ namespace System.ServiceModel
 #endif
                }
 
-#if !NET_2_1
+#if !MOBILE && !XAMMAC_4_5
                private void ApplyBehavior (string behaviorConfig)
                {
                        BehaviorsSection behaviorsSection = ConfigUtil.BehaviorsSection;
@@ -262,7 +260,7 @@ namespace System.ServiceModel
                                new BindingParameterCollection ();
 
                        ContractDescription cd = Endpoint.Contract;
-#if !NET_2_1
+#if !MOBILE
                        pl.Add (ChannelProtectionRequirements.CreateFromContract (cd));
 #endif
 
@@ -300,23 +298,23 @@ namespace System.ServiceModel
                }
 
                protected void InitializeEndpoint (
-                       string endpointConfigurationName,
-                       EndpointAddress remoteAddress)
+                       string configurationName,
+                       EndpointAddress address)
                {
                        InitializeEndpoint (CreateDescription ());
-                       if (remoteAddress != null)
-                               service_endpoint.Address = remoteAddress;
-                       ApplyConfiguration (endpointConfigurationName);
+                       if (address != null)
+                               service_endpoint.Address = address;
+                       ApplyConfiguration (configurationName);
                }
 
                protected void InitializeEndpoint (Binding binding,
-                       EndpointAddress remoteAddress)
+                       EndpointAddress address)
                {
                        InitializeEndpoint (CreateDescription ());
                        if (binding != null)
                                service_endpoint.Binding = binding;
-                       if (remoteAddress != null)
-                               service_endpoint.Address = remoteAddress;
+                       if (address != null)
+                               service_endpoint.Address = address;
                }
 
                protected void InitializeEndpoint (ServiceEndpoint endpoint)