From 9b1dae280b16cf38c87eca83b938952c15b2c64a Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Wed, 28 Oct 2020 17:14:22 -0400
Subject: [PATCH] minor refactoring

---
 .../java/org/cobbzilla/util/collection/ExpirationMap.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/cobbzilla/util/collection/ExpirationMap.java b/src/main/java/org/cobbzilla/util/collection/ExpirationMap.java
index 5fb6f30..8d7ce7b 100644
--- a/src/main/java/org/cobbzilla/util/collection/ExpirationMap.java
+++ b/src/main/java/org/cobbzilla/util/collection/ExpirationMap.java
@@ -81,10 +81,11 @@ public class ExpirationMap<K, V> implements Map<K, V> {
 
         public ExpirationMapEntry<VAL> touch() { atime = now(); return this; }
         public boolean expired() {
+            final long now = now();
             switch (evictionPolicy) {
-                case ctime_or_atime: default: return now() > ctime+maxExpiration || now() > atime+expiration;
-                case atime: return now() > atime+expiration;
-                case ctime: return now() > ctime+expiration;
+                case ctime_or_atime: default: return now > ctime+maxExpiration || now > atime+expiration;
+                case atime: return now > atime+expiration;
+                case ctime: return now > ctime+expiration;
             }
         }
     }