aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/persistance
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-08-16 15:01:06 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-08-16 15:01:06 +0200
commit9edcca1045126ecbaf4818c4e48881e06cbbd657 (patch)
tree9c84e822736e23aa554485003f3801e04c241efc /src/main/java/eu/siacs/conversations/persistance
parente8e0eccd82df13f1a589abce55b9e54325569223 (diff)
parent569bc435d35e79e667045aa5ed861439ebf5363c (diff)
Merge branch 'master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/persistance')
-rw-r--r--src/main/java/eu/siacs/conversations/persistance/FileBackend.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index 6e5a1ae35..f18266d99 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -358,11 +358,7 @@ public class FileBackend {
file.delete();
return false;
}
- } catch (FileNotFoundException e) {
- return false;
- } catch (IOException e) {
- return false;
- } catch (NoSuchAlgorithmException e) {
+ } catch (IllegalArgumentException | IOException | NoSuchAlgorithmException e) {
return false;
} finally {
close(os);