From 173e80cf132be0a6cebd6152eafd73e2538cb780 Mon Sep 17 00:00:00 2001 From: Kui LIU Date: Fri, 13 Oct 2017 00:17:07 +0200 Subject: [PATCH] Remove the redundant nullcheck of value known to be non-null. These source code contains redundant checks of known non-null values against the constant null. http://findbugs.sourceforge.net/bugDescriptions.html#RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE --- src/java/org/apache/poi/hpsf/Variant.java | 2 +- .../org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java | 2 +- .../org/apache/poi/xssf/eventusermodel/XSSFBReader.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/java/org/apache/poi/hpsf/Variant.java b/src/java/org/apache/poi/hpsf/Variant.java index 32fc8aba895..a616c4e8213 100644 --- a/src/java/org/apache/poi/hpsf/Variant.java +++ b/src/java/org/apache/poi/hpsf/Variant.java @@ -420,7 +420,7 @@ public static String getVariantName(final long variantType) { } name += numberToName.get(vt); - return (name != null && !"".equals(name)) ? name : "unknown variant type"; + return (!"".equals(name)) ? name : "unknown variant type"; } /** diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java b/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java index 71fb2322e6b..834aa8a9694 100644 --- a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java +++ b/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java @@ -154,7 +154,7 @@ public void handleRecord(int recordType, byte[] data) throws XSSFBParseException CellRangeAddress cellRangeAddress = new CellRangeAddress(hyperlinkCellRange.firstRow, hyperlinkCellRange.lastRow, hyperlinkCellRange.firstCol, hyperlinkCellRange.lastCol); String url = relIdToHyperlink.get(relId); - if (location == null || location.length() == 0) { + if (location.length() == 0) { location = url; } diff --git a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java b/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java index a1872daeb26..f728ae37996 100644 --- a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java +++ b/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java @@ -253,7 +253,7 @@ private void tryToAddWorksheet(byte[] data) throws XSSFBParseException { String relId = sb.toString(); sb.setLength(0); offset += XSSFBUtils.readXLWideString(data, offset, sb); String name = sb.toString(); - if (relId != null && relId.trim().length() > 0) { + if (relId.trim().length() > 0) { sheets.add(new XSSFSheetRef(relId, name)); } } @@ -272,7 +272,7 @@ private boolean tryOldFormat(byte[] data) throws XSSFBParseException { sb.setLength(0); offset += XSSFBUtils.readXLWideString(data, offset, sb); String name = sb.toString(); - if (relId != null && relId.trim().length() > 0) { + if (relId.trim().length() > 0) { sheets.add(new XSSFSheetRef(relId, name)); } if (offset == data.length) { @@ -285,4 +285,4 @@ List getSheets() { return sheets; } } -} \ No newline at end of file +}