Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug:

Browse Source 
I have noticed that attempting to call a java method like this:

public void foo(String foo, Serializable bar)
{
	// un-important details
}

from script using foo("foo", "bar"); fails because the second argument
is not deemed coercable to Serializable.  A preliminary look at the
coercion code shows that no check is made in this case with
isAssignableFrom().
The to type is only tested against StringClass and ObjectClass (non
primitive case).
(See NativeJavaObject.getConversionWeight())
This commit is contained in:
nboyd%atg.com 2002-05-18 01:57:52 +00:00
parent 9c64fe0ca0
commit e7a091bc74
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
js/rhino/src/org/mozilla/javascript/NativeJavaObject.java
View File

@ -348,7 +348,10 @@ public class NativeJavaObject implements Scriptable, Wrapper, Externalizable {
if (to == ScriptRuntime.StringClass) {
result = 1;
}
else if (to == ScriptRuntime.ObjectClass) {
else if (to == ScriptRuntime.ObjectClass ||
to == ScriptRuntime.SerializableClass ||
to == ScriptRuntime.ComparableClass)
{
result = 2;
}
else if (to.isPrimitive() && to != Boolean.TYPE) {
@ -516,8 +519,8 @@ public class NativeJavaObject implements Scriptable, Wrapper, Externalizable {
* Type-munging for field setting and method invocation.
* Conforms to LC3 specification
*/
static Object coerceType(Class type, Object value,
boolean useErrorHandler)
static Object coerceType(Class type, Object value,
boolean useErrorHandler)
{
if (value != null && value.getClass() == type) {
return value;
@ -575,7 +578,9 @@ public class NativeJavaObject implements Scriptable, Wrapper, Externalizable {
case JSTYPE_STRING:
if (type == ScriptRuntime.StringClass ||
type == ScriptRuntime.ObjectClass) {
type == ScriptRuntime.ObjectClass ||
type == ScriptRuntime.SerializableClass ||
type == ScriptRuntime.ComparableClass) {
return value;
}
else if (type == Character.TYPE ||
@ -678,7 +683,7 @@ public class NativeJavaObject implements Scriptable, Wrapper, Externalizable {
for (int i = 0 ; i < length ; ++i) {
try {
Array.set(Result, i, coerceType(arrayType,
array.get(i, array),
array.get(i, array),
useErrorHandler));
}
catch (EvaluatorException ee) {
@ -784,7 +789,7 @@ public class NativeJavaObject implements Scriptable, Wrapper, Externalizable {
return new Integer((int)toInteger(value,
ScriptRuntime.IntegerClass,
(double)Integer.MIN_VALUE,
(double)Integer.MAX_VALUE,
(double)Integer.MAX_VALUE,
useErrorHandler));
}
}
@ -806,7 +811,7 @@ public class NativeJavaObject implements Scriptable, Wrapper, Externalizable {
return new Long(toInteger(value,
ScriptRuntime.LongClass,
min,
max,
max,
useErrorHandler));
}
}
@ -886,13 +891,13 @@ public class NativeJavaObject implements Scriptable, Wrapper, Externalizable {
}
static long toInteger(Object value, Class type, double min, double max,
boolean useErrorHandler)
boolean useErrorHandler)
{
double d = toDouble(value, useErrorHandler);
if (Double.isInfinite(d) || Double.isNaN(d)) {
// Convert to string first, for more readable message
reportConversionError(ScriptRuntime.toString(value), type,
reportConversionError(ScriptRuntime.toString(value), type,
!useErrorHandler);
}
@ -905,14 +910,14 @@ public class NativeJavaObject implements Scriptable, Wrapper, Externalizable {
if (d < min || d > max) {
// Convert to string first, for more readable message
reportConversionError(ScriptRuntime.toString(value), type,
reportConversionError(ScriptRuntime.toString(value), type,
!useErrorHandler);
}
return (long)d;
}
static void reportConversionError(Object value, Class type,
boolean throwIllegalArg)
static void reportConversionError(Object value, Class type,
boolean throwIllegalArg)
{
if (throwIllegalArg) {
throw new IllegalArgumentException("Cannot convert " + value +

13
js/rhino/src/org/mozilla/javascript/ScriptRuntime.java
View File

@ -82,6 +82,19 @@ public class ScriptRuntime {
public final static Class ObjectClass = Object.class;
public final static Class FunctionClass = Function.class;
public final static Class ClassClass = Class.class;
public final static Class SerializableClass = java.io.Serializable.class;
public final static Class ComparableClass;
static {
// Comparable is only since JDK 1.2
Class c;
try {
c = Class.forName("java.lang.Comparable");
} catch (ClassNotFoundException e) {
c = null;
}
ComparableClass = c;
}
/**
* Convert the value to a boolean.