svn commit: r1907308 - in /poi/trunk: poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java

[fanningpj]

Author: fanningpj
Date: Sat Feb  4 15:10:32 2023
New Revision: 1907308

URL: http://svn.apache.org/viewvc?rev=1907308&view=rev
Log:
[bug-65260] catch Throwable instead of error - see 
https://github.com/apache/poi/pull/425

Modified:
    
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
    poi/trunk/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java

Modified: 
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java?rev=1907308&r1=1907307&r2=1907308&view=diff
==============================================================================
--- 
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java 
(original)
+++ 
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java 
Sat Feb  4 15:10:32 2023
@@ -63,7 +63,7 @@ public class SXSSFSheet implements Sheet
         setRandomAccessWindowSize(randomAccessWindowSize);
         try {
             _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);
         }
     }
@@ -96,7 +96,7 @@ public class SXSSFSheet implements Sheet
         setRandomAccessWindowSize(_workbook.getRandomAccessWindowSize());
         try {
             _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);
         }
     }

Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java?rev=1907308&r1=1907307&r2=1907308&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java Sat Feb  
4 15:10:32 2023
@@ -300,12 +300,12 @@ public class SheetUtil {
         try {
             TextLayout layout = new TextLayout(str.getIterator(), 
fontRenderContext);
             return (int) layout.getAdvance();
-        } catch (UnsatisfiedLinkError | NoClassDefFoundError | InternalError 
e) {
+        } catch (Throwable t) {
             if (ignoreMissingFontSystem) {
                 return DEFAULT_CHAR_WIDTH;
             }
 
-            throw e;
+            throw t;
         }
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org