[Libreoffice-commits] core.git: xmerge/source

[Caolán McNamara (via logerrit)]

 xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java |   
10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

New commits:
commit f5abf4e6275aa4bd7821323f27cdc10912603c19
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Sep 7 17:03:20 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Sep 15 15:29:57 2022 +0200

    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 <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

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
+}