From: AsamK <asamk@gmx.de>
Date: Fri, 5 Jun 2020 10:14:04 +0000 (+0200)
Subject: Ignore closed channel exception when closing the channel lock
X-Git-Tag: v0.6.9~23
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/4177deccf1e91483f54c5fcfacffce0ce525ad39?ds=sidebyside

Ignore closed channel exception when closing the channel lock
---

diff --git a/src/main/java/org/asamk/signal/storage/SignalAccount.java b/src/main/java/org/asamk/signal/storage/SignalAccount.java
index 94935441..d0638e41 100644
--- a/src/main/java/org/asamk/signal/storage/SignalAccount.java
+++ b/src/main/java/org/asamk/signal/storage/SignalAccount.java
@@ -38,6 +38,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.channels.Channels;
+import java.nio.channels.ClosedChannelException;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
 import java.util.Collection;
@@ -429,7 +430,10 @@ public class SignalAccount implements Closeable {
     @Override
     public void close() throws IOException {
         synchronized (fileChannel) {
-            lock.close();
+            try {
+                lock.close();
+            } catch (ClosedChannelException ignored) {
+            }
             fileChannel.close();
         }
     }