mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix bug 49325.

This commit is contained in:
nboyd%atg.com 2000-08-21 15:56:15 +00:00
Родитель d55dd0cde5
Коммит c1c435731a
2 изменённых файлов: 36 добавлений и 30 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

33
js/rhino/org/mozilla/javascript/JavaAdapter.java
Просмотреть файл

@ -288,18 +288,22 @@ public class JavaAdapter extends ScriptableObject {
public static Object callMethod(Scriptable object, String methodId,
Object[] args)
{
if (object.has(methodId, object)) {
try {
Context cx = Context.enter();
Object fun = object.get(methodId, object);
return ScriptRuntime.call(cx, fun, object, args, object);
} catch (JavaScriptException ex) {
// TODO: could occur
} finally {
Context.exit();
}
}
return Context.getUndefinedValue();
try {
Context cx = Context.enter();
Object fun = ScriptableObject.getProperty(object,methodId);
if (fun == Scriptable.NOT_FOUND) {
// It is an error that this function doesn't exist.
// Easiest thing to do is just pass the undefined value
// along and ScriptRuntime will take care of reporting
// the error.
fun = Undefined.instance;
}
return ScriptRuntime.call(cx, fun, object, args, object);
} catch (JavaScriptException ex) {
throw WrappedException.wrapException(ex);
} finally {
Context.exit();
}
}
public static Scriptable toObject(Object value, Scriptable scope,
@ -609,12 +613,11 @@ public class JavaAdapter extends ScriptableObject {
"Ljava/lang/String;[Ljava/lang/Object;)",
"Ljava/lang/Object;");
Class retType = returnType;
if (retType.equals(Void.TYPE)) {
if (returnType.equals(Void.TYPE)) {
cfw.add(ByteCode.POP);
cfw.add(ByteCode.RETURN);
} else {
generateReturnResult(cfw, retType);
generateReturnResult(cfw, returnType);
}
cfw.stopMethod((short)(scopeLocal + 1), null);
}

33
js/rhino/src/org/mozilla/javascript/JavaAdapter.java
Просмотреть файл

@ -288,18 +288,22 @@ public class JavaAdapter extends ScriptableObject {
public static Object callMethod(Scriptable object, String methodId,
Object[] args)
{
if (object.has(methodId, object)) {
try {
Context cx = Context.enter();
Object fun = object.get(methodId, object);
return ScriptRuntime.call(cx, fun, object, args, object);
} catch (JavaScriptException ex) {
// TODO: could occur
} finally {
Context.exit();
}
}
return Context.getUndefinedValue();
try {
Context cx = Context.enter();
Object fun = ScriptableObject.getProperty(object,methodId);
if (fun == Scriptable.NOT_FOUND) {
// It is an error that this function doesn't exist.
// Easiest thing to do is just pass the undefined value
// along and ScriptRuntime will take care of reporting
// the error.
fun = Undefined.instance;
}
return ScriptRuntime.call(cx, fun, object, args, object);
} catch (JavaScriptException ex) {
throw WrappedException.wrapException(ex);
} finally {
Context.exit();
}
}
public static Scriptable toObject(Object value, Scriptable scope,
@ -609,12 +613,11 @@ public class JavaAdapter extends ScriptableObject {
"Ljava/lang/String;[Ljava/lang/Object;)",
"Ljava/lang/Object;");
Class retType = returnType;
if (retType.equals(Void.TYPE)) {
if (returnType.equals(Void.TYPE)) {
cfw.add(ByteCode.POP);
cfw.add(ByteCode.RETURN);
} else {
generateReturnResult(cfw, retType);
generateReturnResult(cfw, returnType);
}
cfw.stopMethod((short)(scopeLocal + 1), null);
}