Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -50,12 +50,16 @@ namespace System.Runtime.Caching
protected void Add (MemoryCacheEntry entry)
{
entries.Add (entry);
lock (entries) {
entries.Add (entry);
}
}
protected void Remove (MemoryCacheEntry entry)
{
entries.Remove (entry);
lock (entries) {
entries.Remove (entry);
}
}
protected int FlushItems (DateTime limit, CacheEntryRemovedReason reason, bool blockInsert, int count = int.MaxValue)

View File

@@ -40,13 +40,13 @@ namespace System.Runtime.Caching
{
}
public void Add (MemoryCacheEntry entry)
public new void Add (MemoryCacheEntry entry)
{
entry.ExpiresEntryRef = new ExpiresEntryRef ();
base.Add (entry);
}
public void Remove (MemoryCacheEntry entry)
public new void Remove (MemoryCacheEntry entry)
{
base.Remove (entry);
entry.ExpiresEntryRef = ExpiresEntryRef.INVALID;

View File

@@ -45,7 +45,7 @@ namespace System.Runtime.Caching {
{
}
public void Add (MemoryCacheEntry entry)
public new void Add (MemoryCacheEntry entry)
{
var now = DateTime.UtcNow;
if (now == prevDateTime)
@@ -61,7 +61,7 @@ namespace System.Runtime.Caching {
base.Add (entry);
}
public void Remove (MemoryCacheEntry entry)
public new void Remove (MemoryCacheEntry entry)
{
base.Remove (entry);
entry.UsageEntryRef = UsageEntryRef.INVALID;