summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2022-09-07 17:03:20 +0100
committerCaolán McNamara <caolanm@redhat.com>2022-09-15 15:29:57 +0200
commitf5abf4e6275aa4bd7821323f27cdc10912603c19 (patch)
treece831da977a6f59b77ff1480126646760fca7463 /xmerge
parentd29958304b3ff87115ed5af16b482327ea05ce14 (diff)
cid#1509209 DCN: Don't Catch NullPointer Exception
Change-Id: I8e2cb9c71793a05db4f08662ee497a5f95759d67 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139995 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java10
1 files changed, 2 insertions, 8 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java
index 829963283e16..e974f649bab4 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java
@@ -125,13 +125,7 @@ public class ActiveSyncDriver {
if (fos != null)
fos.close();
}
- } catch (IOException e) {
- bOK = false;
- } catch (NullPointerException e) {
- bOK = false;
- } catch (ConvertException e) {
- bOK = false;
- } catch (NoSuchElementException e) {
+ } catch (RuntimeException e) {
bOK = false;
} finally {
if (fis != null)
@@ -140,4 +134,4 @@ public class ActiveSyncDriver {
return bOK;
}
-} \ No newline at end of file
+}