Imported Upstream version 5.8.0.22

Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:04:20 +00:00
parent 5f4a27cc8a
commit 7d05485754
5020 changed files with 114082 additions and 186061 deletions

View File

@@ -54,12 +54,12 @@ namespace System.Runtime.Remoting.Lifetime
_initialLeaseTime = LifetimeServices.LeaseTime;
_renewOnCallTime = LifetimeServices.RenewOnCallTime;
_sponsorshipTimeout = LifetimeServices.SponsorshipTimeout;
_leaseExpireTime = DateTime.Now + _initialLeaseTime;
_leaseExpireTime = DateTime.UtcNow + _initialLeaseTime;
}
public TimeSpan CurrentLeaseTime
{
get { return _leaseExpireTime - DateTime.Now; }
get { return _leaseExpireTime - DateTime.UtcNow; }
}
public LeaseState CurrentState
@@ -82,7 +82,7 @@ namespace System.Runtime.Remoting.Lifetime
throw new RemotingException ("InitialLeaseTime property can only be set when the lease is in initial state; state is " + _currentState + ".");
_initialLeaseTime = value;
_leaseExpireTime = DateTime.Now + _initialLeaseTime;
_leaseExpireTime = DateTime.UtcNow + _initialLeaseTime;
if (value == TimeSpan.Zero) _currentState = LeaseState.Null;
}
}
@@ -130,7 +130,7 @@ namespace System.Runtime.Remoting.Lifetime
public TimeSpan Renew (TimeSpan renewalTime)
{
DateTime newTime = DateTime.Now + renewalTime;
DateTime newTime = DateTime.UtcNow + renewalTime;
if (newTime > _leaseExpireTime) _leaseExpireTime = newTime;
return CurrentLeaseTime;
}