Merge branch '2.9' into 2.10

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -664,10 +664,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)
@@ -890,6 +886,14 @@ Joe Barnett (josephlbarnett@github)
     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)
+
 Zihui Ren (renzihui@github)
   * Suggested #2129: Add `SerializationFeature.WRITE_ENUM_KEYS_USING_INDEX`, separate from value setting
    (2.10.0)
@@ -998,4 +1002,3 @@ Richard Wise (Woodz@github)
 Mark Schäfer (mark--@github)
   * Reported #2520: Sub-optimal exception message when failing to deserialize non-static inner classes
   (2.10.1)
-

release-notes/VERSION-2.x

@@ -4,6 +4,11 @@ Project: jackson-databind
 === Releases === 
 ------------------------------------------------------------------------
 
+2.10.2 (not yet released)
+
+#2544: java.lang.NoClassDefFoundError Thrown for compact profile1
+  (reported by Jon A)
+
 2.10.1 (09-Nov-2019)
 
 #2457: Extended enum values are not handled as enums when used as Map keys

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");