Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x

jetty · Jan 16, 2025 · 89ca1bf · 89ca1bf
2 parents e89d1e6 + 74a8bc8
commit 89ca1bf
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/...-core/jetty-session/src/main/java/org/eclipse/jetty/session/AbstractSessionDataStore.java b/...-core/jetty-session/src/main/java/org/eclipse/jetty/session/AbstractSessionDataStore.java
@@ -292,19 +292,20 @@ public Set<String> getExpired(Set<String> candidates)
         // OTHER contexts that expired a very long time ago (ie not being actively
         // managed by any node). As these sessions are not for our context, we 
         // can't load them, so they must just be forcibly deleted.
-        try
+
+        if (now > (_lastOrphanSweepTime + TimeUnit.SECONDS.toMillis(10 * _gracePeriodSec)))
         {
-            if (now > (_lastOrphanSweepTime + TimeUnit.SECONDS.toMillis(10 * _gracePeriodSec)))
+            try
             {
                 if (LOG.isDebugEnabled())
                     LOG.debug("Cleaning orphans at {}, last sweep at {}", now, _lastOrphanSweepTime);
-                
+
                 cleanOrphans(now - TimeUnit.SECONDS.toMillis(10 * _gracePeriodSec));
             }
-        }
-        finally
-        {
-            _lastOrphanSweepTime = now;
+            finally
+            {
+                _lastOrphanSweepTime = now;
+            }
         }
 
         return expired;