Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -78,7 +78,7 @@ namespace System.Runtime.Remoting.Lifetime
{
Timer t = _timer;
_timer = null;
t.Dispose();
if (t != null) t.Dispose();
}
public void ManageLeases(object state)