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

Imported Upstream version 4.8.0.309

Browse Source 
Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mcs/class/referencesource/System.ServiceModel/System/UriTemplate.cs
View File

@@ -4,6 +4,7 @@
namespace System
{
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Collections.Specialized;
@@ -11,6 +12,7 @@ namespace System
using System.ServiceModel;
using System.ServiceModel.Channels;
using System.Text;
using System.Threading;
using System.Runtime.CompilerServices;
using System.Globalization;
@@ -31,7 +33,7 @@ namespace System
const string NullableDefault = "null";
readonly WildcardInfo wildcard;
IDictionary<string, string> defaults;
Dictionary<string, string> unescapedDefaults;
ConcurrentDictionary<string, string> unescapedDefaults;
VariablesCollection variables;
@@ -263,7 +265,7 @@ namespace System
{
if (this.defaults == null)
{
this.defaults = new UriTemplateDefaults(this);
Interlocked.CompareExchange<IDictionary<string, string>>(ref this.defaults, new UriTemplateDefaults(this), null);
}
return this.defaults;
}
@@ -943,16 +945,10 @@ namespace System
}
if (this.unescapedDefaults == null)
{
this.unescapedDefaults = new Dictionary<string, string>(StringComparer.Ordinal);
}
string unescapedValue;
if (!this.unescapedDefaults.TryGetValue(escapedValue, out unescapedValue))
{
unescapedValue = Uri.UnescapeDataString(escapedValue);
this.unescapedDefaults.Add(escapedValue, unescapedValue);
this.unescapedDefaults = new ConcurrentDictionary<string, string>(StringComparer.Ordinal);
}
return unescapedValue;
return this.unescapedDefaults.GetOrAdd(escapedValue, Uri.UnescapeDataString);
}
struct BindInformation
@@ -1181,8 +1177,8 @@ namespace System
{
if (this.pathSegmentVariableNamesSnapshot == null)
{
this.pathSegmentVariableNamesSnapshot = new ReadOnlyCollection<string>(
this.pathSegmentVariableNames);
Interlocked.CompareExchange<ReadOnlyCollection<string>>(ref this.pathSegmentVariableNamesSnapshot, new ReadOnlyCollection<string>(
this.pathSegmentVariableNames), null);
}
return this.pathSegmentVariableNamesSnapshot;
}
@@ -1193,8 +1189,8 @@ namespace System
{
if (this.queryValueVariableNamesSnapshot == null)
{
this.queryValueVariableNamesSnapshot = new ReadOnlyCollection<string>(
this.queryValueVariableNames);
Interlocked.CompareExchange<ReadOnlyCollection<string>>(ref this.queryValueVariableNamesSnapshot, new ReadOnlyCollection<string>(
this.queryValueVariableNames), null);
}
return this.queryValueVariableNamesSnapshot;
}