This is an automated email from the ASF dual-hosted git repository. tv pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
commit 1a2c6ed2628c583eeb71991b11abac5516fdc7f5 Author: Thomas Vandahl <[email protected]> AuthorDate: Thu Mar 19 17:07:19 2026 +0100 Fix naming and Javadoc --- .../org/apache/commons/jcs4/auxiliary/disk/jdbc/JDBCDiskCache.java | 5 ++--- .../commons/jcs4/auxiliary/disk/jdbc/JDBCDiskCacheAttributes.java | 2 +- .../commons/jcs4/auxiliary/disk/jdbc/mysql/MySQLDiskCache.java | 2 +- .../java/org/apache/commons/jcs4/engine/AbstractCacheEventQueue.java | 2 +- .../apache/commons/jcs4/engine/memory/shrinking/ShrinkerThread.java | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/disk/jdbc/JDBCDiskCache.java b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/disk/jdbc/JDBCDiskCache.java index 8bab209c..23241f54 100644 --- a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/disk/jdbc/JDBCDiskCache.java +++ b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/disk/jdbc/JDBCDiskCache.java @@ -64,8 +64,7 @@ import org.apache.commons.jcs4.log.Log; * ); * </pre> * <p> - * The cleanup thread will delete non eternal items where (now - create time) > max life seconds * - * 1000 + * The cleanup thread will delete non eternal items where (now - create time) > max life * </p> * <p> * To speed up the deletion the SYSTEM_EXPIRE_TIME_SECONDS is used instead. It is recommended that @@ -168,7 +167,7 @@ public class JDBCDiskCache<K, V> } /** - * Removed the expired. (now - create time) > max life seconds * 1000 + * Removed the expired. (now - create time) > max life * * @return the number deleted */ diff --git a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/disk/jdbc/JDBCDiskCacheAttributes.java b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/disk/jdbc/JDBCDiskCacheAttributes.java index c26897a7..3ce0f445 100644 --- a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/disk/jdbc/JDBCDiskCacheAttributes.java +++ b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/disk/jdbc/JDBCDiskCacheAttributes.java @@ -140,7 +140,7 @@ public class JDBCDiskCacheAttributes } /** - * @return the shrinkerIntervalSeconds. + * @return the shrinkerInterval. */ public Duration getShrinkerInterval() { diff --git a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/disk/jdbc/mysql/MySQLDiskCache.java b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/disk/jdbc/mysql/MySQLDiskCache.java index 723ce0b3..9691e01e 100644 --- a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/disk/jdbc/mysql/MySQLDiskCache.java +++ b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/disk/jdbc/mysql/MySQLDiskCache.java @@ -65,7 +65,7 @@ public class MySQLDiskCache<K, V> } /** - * Removed the expired. (now - create time) > max life seconds * 1000 + * Removed the expired. (now - create time) > max life * <p> * If we are currently optimizing, then this method will balk and do nothing. * <p> diff --git a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/AbstractCacheEventQueue.java b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/AbstractCacheEventQueue.java index 0641897b..12786bb0 100644 --- a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/AbstractCacheEventQueue.java +++ b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/AbstractCacheEventQueue.java @@ -213,7 +213,7 @@ public abstract class AbstractCacheEventQueue<K, V> /** Maximum number of failures before we buy the farm. */ private int maxFailure; - /** In milliseconds */ + /** Wait time before retry */ private Duration waitBeforeRetry; /** diff --git a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/memory/shrinking/ShrinkerThread.java b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/memory/shrinking/ShrinkerThread.java index 83a2ca85..f3a93b6f 100644 --- a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/memory/shrinking/ShrinkerThread.java +++ b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/memory/shrinking/ShrinkerThread.java @@ -85,9 +85,9 @@ public class ShrinkerThread<K, V> * <ol> * <li>Has the cacheattributes.MaxMemoryIdleTime defined for the region been exceeded? If * so, the item should be move to disk.</li> - * <li>Has the item exceeded MaxLifeSeconds defined in the element attributes? If so, + * <li>Has the item exceeded MaxLife defined in the element attributes? If so, * remove it.</li> - * <li>Has the item exceeded IdleTime defined in the element attributes? If so, remove it. + * <li>Has the item exceeded MaxIdleTime defined in the element attributes? If so, remove it. * If there are event listeners registered for the cache element, they will be called.</li> * </ol> * TODO Change element event handling to use the queue, then move the queue to the region and
