Trim LRU maps after dropping entries

embeddedt · embeddedt · commit dee2627df9af · 2024-09-21T14:21:18.000-04:00
diff --git a/common/src/main/java/org/embeddedt/modernfix/util/LRUMap.java b/common/src/main/java/org/embeddedt/modernfix/util/LRUMap.java
@@ -28,6 +28,7 @@ public void setPermanentEntries(Set<K> permanentEntries) {
     }
 
     public void dropEntriesToMeetSize(int size) {
+        int expectedQuota = size;
         // Increase allowed size quota to include permanent entries
         size += permanentEntries.size();
         int prevSize = size();
@@ -39,6 +40,7 @@ public void dropEntriesToMeetSize(int size) {
                     iterator.remove();
                 }
             }
+            trim(size() + expectedQuota);
             if(ModernFixPlatformHooks.INSTANCE.isDevEnv()) {
                 ModernFix.LOGGER.warn("Trimmed map from {} to {} entries", prevSize, size);
             }

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ public void setPermanentEntries(Set<K> permanentEntries) {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public void dropEntriesToMeetSize(int size) {`
	`31`	`+ int expectedQuota = size;`
`31`	`32`	`// Increase allowed size quota to include permanent entries`
`32`	`33`	`size += permanentEntries.size();`
`33`	`34`	`int prevSize = size();`
`@@ -39,6 +40,7 @@ public void dropEntriesToMeetSize(int size) {`
`39`	`40`	`iterator.remove();`
`40`	`41`	`}`
`41`	`42`	`}`
	`43`	`+ trim(size() + expectedQuota);`
`42`	`44`	`if(ModernFixPlatformHooks.INSTANCE.isDevEnv()) {`
`43`	`45`	`ModernFix.LOGGER.warn("Trimmed map from {} to {} entries", prevSize, size);`
`44`	`46`	`}`