Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch back to using getDeclaredMethods--I was able to get it working with a

Browse Source 
security manager.


git-svn-id: svn://10.0.0.236/trunk@61973 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
norris%netscape.com 2000-03-01 18:26:43 +00:00
parent c6bacf0097
commit 41e82cebb1
2 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mozilla/js/rhino/org/mozilla/javascript/FunctionObject.java
View File

@ -300,42 +300,45 @@ public class FunctionObject extends NativeFunction {
return findMethods(getMethodList(clazz), name);
}
public static Method[] findMethods(Method[] methods, String name) {
static Method[] findMethods(Method[] methods, String name) {
// Usually we're just looking for a single method, so optimize
// for that case.
Vector v = null;
Method[] result = null;
Method first = null;
for (int i=0; i < methods.length; i++) {
if (methods[i] == null)
continue;
if (methods[i].getName().equals(name)) {
if (result == null) {
result = new Method[1];
result[0] = methods[i];
if (first == null) {
first = methods[i];
} else {
if (v == null) {
v = new Vector(5);
v.addElement(result[0]);
v.addElement(first);
}
v.addElement(methods[i]);
}
}
}
if (v == null)
return result;
result = new Method[v.size()];
if (v == null) {
if (first == null)
return null;
Method[] single = { first };
return single;
}
Method[] result = new Method[v.size()];
v.copyInto(result);
return result;
}
public static Method[] getMethodList(Class clazz) {
static Method[] getMethodList(Class clazz) {
Method[] cached = methodsCache; // get once to avoid synchronization
if (cached != null && cached[0].getDeclaringClass() == clazz)
return cached;
Method[] methods = clazz.getMethods();
Method[] methods = clazz.getDeclaredMethods();
int count = 0;
for (int i=0; i < methods.length; i++) {
if (methods[i].getDeclaringClass() != clazz) {
if (!Modifier.isPublic(methods[i].getModifiers())) {
methods[i] = null;
} else {
count++;

27
mozilla/js/rhino/src/org/mozilla/javascript/FunctionObject.java
View File

@ -300,42 +300,45 @@ public class FunctionObject extends NativeFunction {
return findMethods(getMethodList(clazz), name);
}
public static Method[] findMethods(Method[] methods, String name) {
static Method[] findMethods(Method[] methods, String name) {
// Usually we're just looking for a single method, so optimize
// for that case.
Vector v = null;
Method[] result = null;
Method first = null;
for (int i=0; i < methods.length; i++) {
if (methods[i] == null)
continue;
if (methods[i].getName().equals(name)) {
if (result == null) {
result = new Method[1];
result[0] = methods[i];
if (first == null) {
first = methods[i];
} else {
if (v == null) {
v = new Vector(5);
v.addElement(result[0]);
v.addElement(first);
}
v.addElement(methods[i]);
}
}
}
if (v == null)
return result;
result = new Method[v.size()];
if (v == null) {
if (first == null)
return null;
Method[] single = { first };
return single;
}
Method[] result = new Method[v.size()];
v.copyInto(result);
return result;
}
public static Method[] getMethodList(Class clazz) {
static Method[] getMethodList(Class clazz) {
Method[] cached = methodsCache; // get once to avoid synchronization
if (cached != null && cached[0].getDeclaringClass() == clazz)
return cached;
Method[] methods = clazz.getMethods();
Method[] methods = clazz.getDeclaredMethods();
int count = 0;
for (int i=0; i < methods.length; i++) {
if (methods[i].getDeclaringClass() != clazz) {
if (!Modifier.isPublic(methods[i].getModifiers())) {
methods[i] = null;
} else {
count++;