Merge branch 'master' of oss:/var/local/git/avian into dynamic

This commit is contained in:
Joel Dice 2008-04-01 16:49:28 -06:00
commit d5b0cbb543
3 changed files with 12 additions and 2 deletions

View File

@ -376,6 +376,10 @@ public final class Class <T> {
return flags;
}
public boolean isInterface() {
return (flags & Modifier.INTERFACE) != 0;
}
public Class getSuperclass() {
return super_;
}

View File

@ -33,4 +33,6 @@ public final class Modifier {
public static boolean isStatic (int v) { return (v & STATIC) != 0; }
public static boolean isFinal (int v) { return (v & FINAL) != 0; }
public static boolean isSuper (int v) { return (v & SUPER) != 0; }
public static boolean isNative (int v) { return (v & NATIVE) != 0; }
public static boolean isAbstract (int v) { return (v & ABSTRACT) != 0; }
}

View File

@ -1805,9 +1805,13 @@ GetJavaVM(Thread* t, Machine** m)
jboolean JNICALL
IsSameObject(Thread* t, jobject a, jobject b)
{
ENTER(t, Thread::ActiveState);
if (a and b) {
ENTER(t, Thread::ActiveState);
return *a == *b;
return *a == *b;
} else {
return a == b;
}
}
struct JDK1_1InitArgs {