Merge pull request mvel#201 from MalcolmOdd/Issue200

Fix IncompatibleClassChangeError for bean property accessor declared in interface
cubita-io · Dec 16, 2019 · 56b8415 · 56b8415
2 parents dacf9e5 + f0b39f1
commit 56b8415
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java b/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
@@ -1117,9 +1117,16 @@ else if (member != null) {
 
         returnType = ((Method) member).getReturnType();
 
-        assert debug("INVOKEVIRTUAL " + member.getName() + ":" + returnType);
-        mv.visitMethodInsn(INVOKEVIRTUAL, getInternalName(member.getDeclaringClass()), member.getName(),
+        if (member.getDeclaringClass().isInterface()) {
+          assert debug("INVOKEINTERFACE " + member.getName() + ":" + returnType);
+          mv.visitMethodInsn(INVOKEINTERFACE, getInternalName(member.getDeclaringClass()), member.getName(),
+              getMethodDescriptor((Method) member));
+        }
+        else {
+          assert debug("INVOKEVIRTUAL " + member.getName() + ":" + returnType);
+          mv.visitMethodInsn(INVOKEVIRTUAL, getInternalName(member.getDeclaringClass()), member.getName(),
             getMethodDescriptor((Method) member));
+        }
       }
       catch (IllegalAccessException e) {
         Method iFaceMeth = determineActualTargetMethod((Method) member);

diff --git a/src/test/java/org/mvel2/tests/core/PropertyAccessTests.java b/src/test/java/org/mvel2/tests/core/PropertyAccessTests.java
@@ -548,4 +548,20 @@ public void testNullListMapArrayValueMVEL312(){
   public void testPublicStaticFieldMVEL314(){
     assertEquals(Foo.STATIC_BAR, runSingleTest("org.mvel2.tests.core.res.Foo.STATIC_BAR"));
   }
+  /*
+   * Test fix for https://github.com/mvel/mvel/issues/200
+   */
+  public void testCollectionEmptyASM() {
+    Serializable compiled = MVEL.compileExpression("validationIssues.empty");
+    Map<String, Object> properties = new HashMap<String, Object>();
+    properties.put("validationIssues", new ArrayList<Object>());
+    int trueCount = 0;
+    final int COUNT = 1000;
+    for (int i = 0; i < COUNT; i++) {
+        if (MVEL.executeExpression(compiled, properties, Boolean.class)) {
+            trueCount++;
+        }
+    }
+    assertEquals(COUNT, trueCount);
+  }
 }