From 38ef2b2d81207eee78cddf1643689862b1f92a6e Mon Sep 17 00:00:00 2001 From: "beard%netscape.com" Date: Sat, 25 Sep 1999 01:37:32 +0000 Subject: [PATCH] Fixed generateSuper when override has void return type. --- js/rhino/org/mozilla/javascript/JavaAdapter.java | 2 ++ js/rhino/src/org/mozilla/javascript/JavaAdapter.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/js/rhino/org/mozilla/javascript/JavaAdapter.java b/js/rhino/org/mozilla/javascript/JavaAdapter.java index 080daf251353..6fe587d2bec4 100644 --- a/js/rhino/org/mozilla/javascript/JavaAdapter.java +++ b/js/rhino/org/mozilla/javascript/JavaAdapter.java @@ -694,6 +694,8 @@ public class JavaAdapter extends ScriptableObject { Class retType = returnType; if (!retType.equals(Void.TYPE)) { generatePopResult(cfw, retType); + } else { + cfw.add(ByteCode.RETURN); } cfw.stopMethod((short)(paramOffset + 1), null); } diff --git a/js/rhino/src/org/mozilla/javascript/JavaAdapter.java b/js/rhino/src/org/mozilla/javascript/JavaAdapter.java index 080daf251353..6fe587d2bec4 100644 --- a/js/rhino/src/org/mozilla/javascript/JavaAdapter.java +++ b/js/rhino/src/org/mozilla/javascript/JavaAdapter.java @@ -694,6 +694,8 @@ public class JavaAdapter extends ScriptableObject { Class retType = returnType; if (!retType.equals(Void.TYPE)) { generatePopResult(cfw, retType); + } else { + cfw.add(ByteCode.RETURN); } cfw.stopMethod((short)(paramOffset + 1), null); }