mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.3.2.467

Browse Source 
Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mcs/class/System.ServiceModel/System.ServiceModel/NetTcpBinding.cs
View File

@@ -43,7 +43,8 @@ namespace System.ServiceModel
int max_conn;
OptionalReliableSession reliable_session;
NetTcpSecurity security;
XmlDictionaryReaderQuotas reader_quotas;
XmlDictionaryReaderQuotas reader_quotas
= new XmlDictionaryReaderQuotas ();
bool transaction_flow;
TransactionProtocol transaction_protocol;
TcpTransportBindingElement transport;

9
mcs/class/System.ServiceModel/System.ServiceModel/ServiceHost.cs
View File

@@ -101,7 +101,9 @@ namespace System.ServiceModel
ContractDescription cd = GetExistingContract (implementedContract);
if (cd == null) {
cd = ContractDescription.GetContract (implementedContract);
contracts.Add (cd.ContractType.FullName, cd);
if (!contracts.ContainsKey (cd.ContractType.FullName)) {
contracts.Add (cd.ContractType.FullName, cd);
}
}
return AddServiceEndpointCore (cd, binding, ea, listenUri);
@@ -121,7 +123,8 @@ namespace System.ServiceModel
contracts = new Dictionary<string,ContractDescription> ();
implementedContracts = contracts;
ServiceDescription sd;
foreach (ContractDescription cd in GetServiceContractDescriptions())
IEnumerable<ContractDescription> contractDescriptions = GetServiceContractDescriptions ();
foreach (ContractDescription cd in contractDescriptions)
contracts.Add (cd.ContractType.FullName, cd);
if (SingletonInstance != null) {
@@ -148,7 +151,7 @@ namespace System.ServiceModel
TAttr PopulateAttribute<TAttr> ()
{
object [] atts = service_type.GetCustomAttributes (typeof (TAttr), false);
object [] atts = service_type.GetCustomAttributes (typeof (TAttr), true);
return (TAttr) (atts.Length > 0 ? atts [0] : Activator.CreateInstance (typeof (TAttr)));
}