aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src-tauri/src/core/java/providers/adoptium.rs
diff options
context:
space:
mode:
authorBegonia, HE <163421589+BegoniaHe@users.noreply.github.com>2026-01-26 19:03:49 +0100
committerBegonia, HE <163421589+BegoniaHe@users.noreply.github.com>2026-01-29 03:01:26 +0100
commit6bb967f05b2dd32dc1cd1b849a6089bc80667aec (patch)
tree604075accba8b472efc9d8c90db65e62030c72d2 /src-tauri/src/core/java/providers/adoptium.rs
parent2c90c392114a8948190e4253f0cae9379f3a614d (diff)
downloadDropOut-6bb967f05b2dd32dc1cd1b849a6089bc80667aec.tar.gz
DropOut-6bb967f05b2dd32dc1cd1b849a6089bc80667aec.zip
refactor(java): simplify version compatibility logic and improve error handling
- Extract version compatibility check into shared validation function - Remove duplicated version checking code across multiple modules - Simplify Java detection timeout logic in detection.rs - Expand vendor detection to support more JDK distributions (Dragonwell, Kona, Semeru, BiSheng, etc.) - Refactor start_game to use priority-based Java resolution - Improve error handling in Adoptium provider task collection Reviewed-by: Claude Sonnet 4.5
Diffstat (limited to 'src-tauri/src/core/java/providers/adoptium.rs')
-rw-r--r--src-tauri/src/core/java/providers/adoptium.rs12
1 files changed, 10 insertions, 2 deletions
diff --git a/src-tauri/src/core/java/providers/adoptium.rs b/src-tauri/src/core/java/providers/adoptium.rs
index 53d1519..aac2bf2 100644
--- a/src-tauri/src/core/java/providers/adoptium.rs
+++ b/src-tauri/src/core/java/providers/adoptium.rs
@@ -171,8 +171,16 @@ impl JavaProvider for AdoptiumProvider {
// Collect all results concurrently
let mut releases = Vec::new();
for task in fetch_tasks {
- if let Ok(Some(release)) = task.await {
- releases.push(release);
+ match task.await {
+ Ok(Some(release)) => {
+ releases.push(release);
+ }
+ Ok(None) => {
+ // Task completed but returned None, should not happen in current implementation
+ }
+ Err(e) => {
+ eprintln!("AdoptiumProvider::fetch_catalog task join error: {:?}", e);
+ }
}
}