Fix #74

FasterXML · Feb 7, 2019 · 2cb91b0 · 2cb91b0
1 parent 38eee87
commit 2cb91b0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/mrbean/src/main/java/com/fasterxml/jackson/module/mrbean/AbstractTypeMaterializer.java b/mrbean/src/main/java/com/fasterxml/jackson/module/mrbean/AbstractTypeMaterializer.java
@@ -254,7 +254,8 @@ public Class<?> materializeRawType(MapperConfig<?> config, AnnotatedClass typeDe
         return _classLoader.loadAndResolve(newName, bytecode, rawType);
     }
 
-    private boolean _suitableType(JavaType type)
+    // private until 2.9.9
+    protected boolean _suitableType(JavaType type)
     {
         // Future plans may include calling of this method for all kinds of abstract types.
         // So as simple precaution, let's limit kinds of types we will try materialize
@@ -268,7 +269,9 @@ private boolean _suitableType(JavaType type)
                 // 22-Jun-2016, tatu: As per [#12], avoid these too
                 || (cls == Date.class) || (cls == Calendar.class)
                 || (cls == CharSequence.class) || (cls == Iterable.class) || (cls == Iterator.class)
-                ) {
+                // 06-Feb-2019, tatu: [modules-base#74] and:
+                || (cls == java.io.Serializable.class)
+        ) {
             return false;
         }
 

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.fasterxml.jackson</groupId>
     <artifactId>jackson-base</artifactId>
-    <version>2.9.8</version>
+    <version>2.9.9-SNAPSHOT</version>
   </parent>
   <groupId>com.fasterxml.jackson.module</groupId>
   <artifactId>jackson-modules-base</artifactId>

diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -31,3 +31,8 @@ Dan Sănduleac (dansanduleac@github)
 * Reported, contributed fix to #69: `ALLOW_COERCION_OF_SCALARS` ignored deserializing scalars
    with Afterburner
  (2.9.9)
+
+Georg Schmidt-Dumont (georgschmidtdumont@github)
+
+* Reported #74: MrBean module should not materialize `java.io.Serializable`
+ (2.9.9)
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -14,6 +14,8 @@ Modules:
 
 #69: `ALLOW_COERCION_OF_SCALARS` ignored deserializing scalars with Afterburner
  (reported, fix contributed by Dan S)
+#74: MrBean module should not materialize `java.io.Serializable`
+ (reported by Georg S-D)
 
 2.9.8 (15-Dec-2018)