lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 4232: 修复初始化 CacheRepository 导致启动器崩溃的问题 (#4235)

Browse Source
This commit is contained in:
Glavo
2025-08-10 21:41:10 +08:00
committed by GitHub
parent 80f1367d9a
commit 9213b7fb2e
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultCacheRepository.java
View File

@@ -71,7 +71,7 @@ public class DefaultCacheRepository extends CacheRepository {
} else { } else {
index = new Index(); index = new Index();
} }
} catch (IOException | JsonParseException e) { } catch (Exception e) {
LOG.warning("Unable to read index file", e); LOG.warning("Unable to read index file", e);
index = new Index(); index = new Index();
} finally { } finally {

5
HMCLCore/src/main/java/org/jackhuang/hmcl/util/CacheRepository.java
View File

@@ -17,7 +17,6 @@
*/ */
package org.jackhuang.hmcl.util; package org.jackhuang.hmcl.util;
import com.google.gson.JsonParseException;
import com.google.gson.JsonSyntaxException; import com.google.gson.JsonSyntaxException;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
import org.jackhuang.hmcl.util.function.ExceptionalSupplier; import org.jackhuang.hmcl.util.function.ExceptionalSupplier;
@@ -75,7 +74,7 @@ public class CacheRepository {
index = new LinkedHashMap<>(); index = new LinkedHashMap<>();
indexFileLastModified = null; indexFileLastModified = null;
} }
} catch (IOException | JsonParseException e) { } catch (Exception e) {
LOG.warning("Unable to read index file", e); LOG.warning("Unable to read index file", e);
index = new LinkedHashMap<>(); index = new LinkedHashMap<>();
indexFileLastModified = null; indexFileLastModified = null;
@@ -354,7 +353,7 @@ public class CacheRepository {
} }
public int compareTo(ETagItem other) { public int compareTo(ETagItem other) {
if (!url.equals(other.url)) if (!url.equals(other.url) && !NetworkUtils.toURI(url).equals(NetworkUtils.toURI(other.url)))
throw new IllegalArgumentException(); throw new IllegalArgumentException();
ZonedDateTime thisTime = Lang.ignoringException(() -> ZonedDateTime.parse(remoteLastModified, DateTimeFormatter.RFC_1123_DATE_TIME), null); ZonedDateTime thisTime = Lang.ignoringException(() -> ZonedDateTime.parse(remoteLastModified, DateTimeFormatter.RFC_1123_DATE_TIME), null);