Fix Enterprise Beans bean method generation

Signed-off-by: Alexander Pinčuk <alexander.v.pinchuk@gmail.com>
eclipse-ee4j · Jul 6, 2023 · 4183761 · 4183761
1 parent fc8e524
commit 4183761
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/EjbOptionalIntfGenerator.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/EjbOptionalIntfGenerator.java
@@ -267,8 +267,11 @@ private static void generateBeanMethod(ClassVisitor cv, String subClassInternalN
         }
 
         mv.visitMethodInsn(INVOKEINTERFACE, Type.getInternalName(delegateClass), methodName, methodDesc, true);
-        mv.visitInsn(Type.getReturnType(methodDesc).getOpcode(IRETURN));
-        mv.visitMaxs(varIndex, varIndex);
+
+        Type returnType = Type.getReturnType(methodDesc);
+
+        mv.visitInsn(returnType.getOpcode(IRETURN));
+        mv.visitMaxs(Math.max(varIndex, returnType.getSize()), varIndex);
         mv.visitEnd();
     }