diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x index 33e69ddb09..5e92884c1b 100644 --- a/release-notes/CREDITS-2.x +++ b/release-notes/CREDITS-2.x @@ -661,10 +661,6 @@ svarzee@github * Reported #2109, suggested fix: Canonical string for reference type is built incorrectly (2.8.11.3 / 2.9.7) -Kaki King (kingkk9279@g) - * Reported #2449: Block one more gadget type (cve CVE-2019-14540) - (2.9.10) - Connor Kuhn (ckuhn@github) * Contributed #1341: FAIL_ON_MISSING_EXTERNAL_TYPE_ID_PROPERTY (2.9.0) @@ -868,3 +864,11 @@ Joe Barnett (josephlbarnett@github) * Reported, contributed fix for #2404: FAIL_ON_MISSING_EXTERNAL_TYPE_ID_PROPERTY setting ignored when creator properties are buffered (2.9.10) + +Kaki King (kingkk9279@g) + * Reported #2449: Block one more gadget type (cve CVE-2019-14540) + (2.9.10) + +Jon Anderson (Jon901@github) + * Reported #2544: java.lang.NoClassDefFoundError Thrown for compact profile1 + (2.9.10.2) diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x index 36aef4ddf0..430c5fe323 100644 --- a/release-notes/VERSION-2.x +++ b/release-notes/VERSION-2.x @@ -8,6 +8,8 @@ Project: jackson-databind #2526: Block two more gadget types (ehcache/JNDI - CVEs to be allocated) (repoerted by UltramanGaia) +#2544: java.lang.NoClassDefFoundError Thrown for compact profile1 + (reported by Jon A) 2.9.10.1 (20-Oct-2019) diff --git a/src/main/java/com/fasterxml/jackson/databind/ext/OptionalHandlerFactory.java b/src/main/java/com/fasterxml/jackson/databind/ext/OptionalHandlerFactory.java index 011c31f830..f22e8d5dbc 100644 --- a/src/main/java/com/fasterxml/jackson/databind/ext/OptionalHandlerFactory.java +++ b/src/main/java/com/fasterxml/jackson/databind/ext/OptionalHandlerFactory.java @@ -51,7 +51,7 @@ public class OptionalHandlerFactory implements java.io.Serializable try { node = org.w3c.dom.Node.class; doc = org.w3c.dom.Document.class; - } catch (Exception e) { + } catch (Throwable e) { // not optimal but will do Logger.getLogger(OptionalHandlerFactory.class.getName()) .log(Level.INFO, "Could not load DOM `Node` and/or `Document` classes: no DOM support");