Simplify DelayDeactivation logic (#8712)

Co-authored-by: b.nichvolodov <[email protected]>
dotnet · Nov 11, 2023 · e94f117 · e94f117
1 parent cd1aebc
commit e94f117
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/Orleans.Runtime/Catalog/ActivationData.cs b/src/Orleans.Runtime/Catalog/ActivationData.cs
@@ -396,16 +396,16 @@ internal List<Message> DequeueAllWaitingRequests()
 
         public void DelayDeactivation(TimeSpan timespan)
         {
-            if (timespan <= TimeSpan.Zero && timespan != Timeout.InfiniteTimeSpan)
-            {
-                // reset any current keepAliveUntil
-                ResetKeepAliveRequest();
-            }
-            else if (timespan == TimeSpan.MaxValue || timespan == Timeout.InfiniteTimeSpan)
+            if (timespan == TimeSpan.MaxValue || timespan == Timeout.InfiniteTimeSpan)
             {
                 // otherwise creates negative time.
                 KeepAliveUntil = DateTime.MaxValue;
             }
+            else if (timespan <= TimeSpan.Zero)
+            {
+                // reset any current keepAliveUntil
+                ResetKeepAliveRequest();
+            }
             else
             {
                 KeepAliveUntil = DateTime.UtcNow + timespan;