From f3ee5a0d2ee88bcde84cdb43e9b22bbc6c0be1af Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 26 Aug 2022 08:40:14 +0100 Subject: cid#1509239 DCN: Don't Catch NullPointer Exception MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and cid#1509234 DCN: Don't Catch NullPointer Exception cid#1509229 DCN: Don't Catch NullPointer Exception cid#1509219 DCN: Don't Catch NullPointer Exception cid#1509216 DCN: Don't Catch NullPointer Exception Change-Id: Iab1512b4e5ecd632104a58b1fc09ef150825f498 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138859 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- qadevOOo/runner/util/DesktopTools.java | 4 ---- qadevOOo/tests/java/ifc/i18n/_XTransliteration.java | 14 ++------------ qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java | 2 -- qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java | 4 +--- 4 files changed, 3 insertions(+), 21 deletions(-) (limited to 'qadevOOo') diff --git a/qadevOOo/runner/util/DesktopTools.java b/qadevOOo/runner/util/DesktopTools.java index 1c1b04402838..c78e450ae721 100644 --- a/qadevOOo/runner/util/DesktopTools.java +++ b/qadevOOo/runner/util/DesktopTools.java @@ -339,10 +339,6 @@ public class DesktopTools { System.out.println("Couldn't close document"); } - catch (NullPointerException e) - { - System.out.println("Couldn't close document"); - } catch (com.sun.star.beans.PropertyVetoException e) { System.out.println("Couldn't close document"); diff --git a/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java b/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java index d041d425dbbe..eff58351f20e 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java +++ b/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java @@ -338,12 +338,7 @@ public class _XTransliteration extends MultiMethodTest { log.println("('" + str1 + "', " + p1 + ", " + len1 + ", '" + str2 + "', " + p2 + ", " + len2 + ")"); - res = -666 ; - try { - res = oObj.compareSubstring(str2, p2, len2, str1, p1, len1); - } catch (NullPointerException e) { - log.println("Exception while method calling occurs :" + e); - } + res = oObj.compareSubstring(str2, p2, len2, str1, p1, len1); if (res != -expRes) { log.print("Comparing FAILED; return: " + res + ", expected: " + @@ -424,12 +419,7 @@ public class _XTransliteration extends MultiMethodTest { if (!testReverse) return ret ; - res = -666 ; - try { - res = oObj.compareString(str2, str1); - } catch (NullPointerException e) { - log.println("Exception while method calling occurs :" + e); - } + res = oObj.compareString(str2, str1); if (res == -expRes) { log.println("Comparing of '" + str2 + "' and '" + str1 + "' OK" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java b/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java index 436901258d98..e0591afc2566 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java @@ -149,8 +149,6 @@ public class ScTableSheetObj extends TestCase { log.println("Couldn't close document"); } catch (com.sun.star.lang.DisposedException e) { log.println("Document already disposed"); - } catch (NullPointerException e) { - log.println("Couldn't get XCloseable"); } util.utils.pause(500); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java index 8e694058b9a3..64de47ec088a 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java @@ -125,8 +125,6 @@ public class AccessibleTabBar extends TestCase { closer.close(true); } catch (com.sun.star.util.CloseVetoException e) { log.println("Couldn't close document " + e.getMessage()); - } catch (NullPointerException e) { - log.println("Couldn't close document " + e.getMessage()); } } -} \ No newline at end of file +} -- cgit