Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[bug-65260] catch Throwable instead of error - see https://github.com/apache/poi/pull/425 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1907308 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2023-02-04 15:10:32 +00:00
parent 34f6955a28
commit 040181c42f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
View File

@ -63,7 +63,7 @@ public class SXSSFSheet implements Sheet, OoxmlSheetExtensions {
setRandomAccessWindowSize(randomAccessWindowSize); setRandomAccessWindowSize(randomAccessWindowSize);
try { try {
_autoSizeColumnTracker = new AutoSizeColumnTracker(this); _autoSizeColumnTracker = new AutoSizeColumnTracker(this);
} catch (InternalError e) { } catch (Throwable t) {
LOG.atWarn().log("Failed to create AutoSizeColumnTracker, possibly due to fonts not being installed in your OS", e); LOG.atWarn().log("Failed to create AutoSizeColumnTracker, possibly due to fonts not being installed in your OS", e);
} }
} }
@ -96,7 +96,7 @@ public class SXSSFSheet implements Sheet, OoxmlSheetExtensions {
setRandomAccessWindowSize(_workbook.getRandomAccessWindowSize()); setRandomAccessWindowSize(_workbook.getRandomAccessWindowSize());
try { try {
_autoSizeColumnTracker = new AutoSizeColumnTracker(this); _autoSizeColumnTracker = new AutoSizeColumnTracker(this);
} catch (InternalError e) { } catch (Throwable e) {
LOG.atWarn().log("Failed to create AutoSizeColumnTracker, possibly due to fonts not being installed in your OS", e); LOG.atWarn().log("Failed to create AutoSizeColumnTracker, possibly due to fonts not being installed in your OS", e);
} }
} }

4
poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java
View File

@ -300,12 +300,12 @@ public class SheetUtil {
try { try {
TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext); TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext);
return (int) layout.getAdvance(); return (int) layout.getAdvance();
} catch (UnsatisfiedLinkError | NoClassDefFoundError | InternalError e) { } catch (Throwable t) {
if (ignoreMissingFontSystem) { if (ignoreMissingFontSystem) {
return DEFAULT_CHAR_WIDTH; return DEFAULT_CHAR_WIDTH;
} }
throw e; throw t;
} }
} }