Merge remote-tracking branch 'origin/master'

This commit is contained in:
LamGC 2020-07-02 23:33:36 +08:00
commit 5383de7450
Signed by: LamGC
GPG Key ID: 6C5AE2A913941E1D
2 changed files with 2 additions and 2 deletions

View File

@ -27,7 +27,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding> <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<mirai.CoreVersion>1.0.2</mirai.CoreVersion> <mirai.CoreVersion>1.0.4</mirai.CoreVersion>
<mirai.JaptVersion>1.1.1</mirai.JaptVersion> <mirai.JaptVersion>1.1.1</mirai.JaptVersion>
<kotlin.version>1.3.71</kotlin.version> <kotlin.version>1.3.71</kotlin.version>
<ktor.version>1.3.2</ktor.version> <ktor.version>1.3.2</ktor.version>

View File

@ -158,7 +158,7 @@ public class LocalHashCacheStore<T> implements CacheStore<T>, Cleanable {
expireKeySet.forEach(cache::remove); expireKeySet.forEach(cache::remove);
} }
public static class CacheObject<T> implements Comparable<CacheObject<T>> { private static class CacheObject<T> implements Comparable<CacheObject<T>> {
private final AtomicReference<T> value; private final AtomicReference<T> value;
private final AtomicReference<Date> expire; private final AtomicReference<Date> expire;