From: Dominik Stadler Date: Tue, 26 Sep 2017 12:33:08 +0000 (+0000) Subject: Replace "getEntry() plus catch" by "hasEntry()" in HSSFWorkbook X-Git-Tag: REL_4_0_0_FINAL~463 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9bb3e05e6aa139142836b8980516cd23d99f3b97;p=poi.git Replace "getEntry() plus catch" by "hasEntry()" in HSSFWorkbook git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1809738 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java index 70d947ee5f..01324e5716 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java @@ -271,13 +271,9 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss } public static String getWorkbookDirEntryName(DirectoryNode directory) { - - for (String wbName : WORKBOOK_DIR_ENTRY_NAMES) { - try { - directory.getEntry(wbName); + for(String wbName : WORKBOOK_DIR_ENTRY_NAMES) { + if(directory.hasEntry(wbName)) { return wbName; - } catch (FileNotFoundException e) { - // continue - to try other options } }