From b687f0c22fefffc987675d562af1acf5d0236b09 Mon Sep 17 00:00:00 2001 From: Markus Pfeiffer Date: Tue, 21 Nov 2023 15:37:21 +0100 Subject: [PATCH] android: Use try-with-resources for IO --- .../java/org/strongswan/android/logic/CharonVpnService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java index 6bd5e6bc4..5f5b2a187 100644 --- a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java +++ b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java @@ -1037,9 +1037,8 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe @Override public synchronized void run() { - try + try (FileInputStream plain = new FileInputStream(mFd.getFileDescriptor())) { - FileInputStream plain = new FileInputStream(mFd.getFileDescriptor()); ByteBuffer packet = ByteBuffer.allocate(mCache.mMtu); while (true) { @@ -1073,7 +1072,7 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe } } } - catch (ClosedByInterruptException | InterruptedException e) + catch (final ClosedByInterruptException | InterruptedException e) { /* regular interruption */ }