Merge pull request #225 from FasterXML/tatu/2.16/223-fix-default-sett…

…er-call Fix #223: apply check for default (interface) method in all applicable locations
FasterXML · Oct 24, 2023 · 4d11894 · 4d11894
2 parents a1744ad + 2fe5bdd
commit 4d11894
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...rc/main/java/com/fasterxml/jackson/module/afterburner/deser/PropertyMutatorCollector.java b/...rc/main/java/com/fasterxml/jackson/module/afterburner/deser/PropertyMutatorCollector.java
@@ -293,7 +293,7 @@ private <T extends OptimizedSettableBeanProperty<T>> void _addSettersUsingIf(Met
         // to fix [Issue-5] (don't assume return type is 'void'), we need to:
         Type returnType = Type.getType(method.getReturnType());
 
-        boolean isInterface = method.getDeclaringClass().isInterface();
+        boolean isInterface = isInterfaceMethod(method);
         mv.visitMethodInsn(isInterface ? INVOKEINTERFACE : INVOKEVIRTUAL,
                 beanClassName, method.getName(), "("+type+")"+returnType, isInterface);
         mv.visitInsn(RETURN);
@@ -318,7 +318,7 @@ private <T extends OptimizedSettableBeanProperty<T>> void _addSettersUsingIf(Met
             if (mustCast) {
                 mv.visitTypeInsn(CHECKCAST, type.getInternalName());
             }
-            isInterface = method.getDeclaringClass().isInterface();
+            isInterface = isInterfaceMethod(method);
             mv.visitMethodInsn(isInterface ? INVOKEINTERFACE : INVOKEVIRTUAL,
                     beanClassName, method.getName(), "("+type+")"+returnType, isInterface);
             mv.visitInsn(RETURN);
@@ -348,7 +348,7 @@ private <T extends OptimizedSettableBeanProperty<T>> void _addSettersUsingSwitch
             if (mustCast) {
                 mv.visitTypeInsn(CHECKCAST, type.getInternalName());
             }
-            boolean isInterface = method.getDeclaringClass().isInterface();
+            boolean isInterface = isInterfaceMethod(method);
             mv.visitMethodInsn(isInterface ? INVOKEINTERFACE : INVOKEVIRTUAL,
                     beanClassName, method.getName(), "("+type+")"+returnType, isInterface);
             mv.visitInsn(RETURN);

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -21,6 +21,10 @@ Active maintainers:
 === Releases ===
 ------------------------------------------------------------------------
 
+#223: IncompatibleClassChangeError when deserializing a class implementing
+  an interface with default get/set implementations
+ (reported by @avnersin)
+
 2.16.0-rc1 (20-Oct-2023)
 
 #181: (blackbird) BlackBird proxy object error in Java 17