Merge pull request #343 from csware/catch-throwable

jmanico · web-flow · commit 148f0dd5f041 · 2026-01-22T12:41:04.000-08:00
diff --git a/java8-shim/src/main/java/org/owasp/shim/Java8Shim.java b/java8-shim/src/main/java/org/owasp/shim/Java8Shim.java
@@ -19,7 +19,7 @@ public abstract class Java8Shim {
             try {
                 // This is compiled with -release 1.9 in a separate project.
                 _instance = Class.forName("org.owasp.shim.ForJava9AndLater").newInstance();
-            } catch (Error e) {
+            } catch (Throwable e) {
                 // This is co-located with this project and is a fall-back.
                 _instance = Class.forName("org.owasp.shim.ForJava8").newInstance();
             }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public abstract class Java8Shim {`
`19`	`19`	`try {`
`20`	`20`	`// This is compiled with -release 1.9 in a separate project.`
`21`	`21`	`_instance = Class.forName("org.owasp.shim.ForJava9AndLater").newInstance();`
`22`		`- } catch (Error e) {`
	`22`	`+ } catch (Throwable e) {`
`23`	`23`	`// This is co-located with this project and is a fall-back.`
`24`	`24`	`_instance = Class.forName("org.owasp.shim.ForJava8").newInstance();`
`25`	`25`	`}`