From 6474f912a47991a634c34ae465b1c8c153d61473 Mon Sep 17 00:00:00 2001 From: Sanjay Malakar Date: Mon, 9 Mar 2026 07:59:33 +0000 Subject: [PATCH] Fix ConcatReader.close() to close all readers on failure --- app/src/main/java/com/stardust/io/ConcatReader.java | 9 ++++++++- app/src/main/java/org/autojs/autojs/io/ConcatReader.java | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/stardust/io/ConcatReader.java b/app/src/main/java/com/stardust/io/ConcatReader.java index 3e6ef327..22f6fe41 100644 --- a/app/src/main/java/com/stardust/io/ConcatReader.java +++ b/app/src/main/java/com/stardust/io/ConcatReader.java @@ -383,10 +383,17 @@ public class ConcatReader extends Reader { @Override public void close() throws IOException { if (closed) return; + IOException first = null; for (Reader reader : readerQueue) { - reader.close(); + try { + reader.close(); + } catch (IOException e) { + if (first == null) first = e; + else first.addSuppressed(e); + } } closed = true; + if (first != null) throw first; } /** diff --git a/app/src/main/java/org/autojs/autojs/io/ConcatReader.java b/app/src/main/java/org/autojs/autojs/io/ConcatReader.java index 0d1fac1e..20d825ad 100644 --- a/app/src/main/java/org/autojs/autojs/io/ConcatReader.java +++ b/app/src/main/java/org/autojs/autojs/io/ConcatReader.java @@ -381,10 +381,17 @@ public class ConcatReader extends Reader { @Override public void close() throws IOException { if (closed) return; + IOException first = null; for (Reader reader : readerQueue) { - reader.close(); + try { + reader.close(); + } catch (IOException e) { + if (first == null) first = e; + else first.addSuppressed(e); + } } closed = true; + if (first != null) throw first; } /**