diff options
Diffstat (limited to 'libjava/java/io/natObjectInputStream.cc')
-rw-r--r-- | libjava/java/io/natObjectInputStream.cc | 44 |
1 files changed, 9 insertions, 35 deletions
diff --git a/libjava/java/io/natObjectInputStream.cc b/libjava/java/io/natObjectInputStream.cc index 9da4910..0e0d5a7 100644 --- a/libjava/java/io/natObjectInputStream.cc +++ b/libjava/java/io/natObjectInputStream.cc @@ -12,6 +12,7 @@ details. */ #include <gcj/cni.h> #include <jvm.h> +#include <gcj/method.h> #include <java/io/ObjectInputStream$GetField.h> #include <java/io/ObjectInputStream.h> @@ -21,6 +22,8 @@ details. */ #include <java/lang/reflect/Method.h> #include <java/lang/ArrayIndexOutOfBoundsException.h> #include <java/lang/SecurityManager.h> +#include <java/lang/reflect/Constructor.h> +#include <java/lang/reflect/Method.h> #ifdef DEBUG #include <java/lang/System.h> @@ -28,7 +31,8 @@ details. */ #endif jobject -java::io::ObjectInputStream::allocateObject (jclass klass) +java::io::ObjectInputStream::allocateObject (jclass klass, jclass, + ::java::lang::reflect::Constructor *ctr) { jobject obj = NULL; using namespace java::lang::reflect; @@ -41,21 +45,15 @@ java::io::ObjectInputStream::allocateObject (jclass klass) else { obj = _Jv_AllocObject (klass); - } + } } catch (jthrowable t) { return NULL; } - return obj; -} - + jmethodID meth = _Jv_FromReflectedConstructor (ctr); -void -java::io::ObjectInputStream::callConstructor (jclass klass, jobject obj) -{ - jstring init_name = JvNewStringLatin1 ("<init>"); // This is a bit inefficient, and a bit of a hack, since we don't // actually use the Method and since what is returned isn't // technically a Method. We can't use Method.invoke as it looks up @@ -63,36 +61,12 @@ java::io::ObjectInputStream::callConstructor (jclass klass, jobject obj) JArray<jclass> *arg_types = (JArray<jclass> *) JvNewObjectArray (0, &java::lang::Class::class$, NULL); - java::lang::reflect::Method *m = klass->getPrivateMethod (init_name, - arg_types); + // We lie about this being a constructor. If we put `true' here // then _Jv_CallAnyMethodA would try to allocate the object for us. - jmethodID meth = (jmethodID) ((char *) (klass->methods) - + m->offset); _Jv_CallAnyMethodA (obj, JvPrimClass (void), meth, false, arg_types, NULL); -} -java::lang::ClassLoader* -java::io::ObjectInputStream::getCallersClassLoader () -{ - java::lang::ClassLoader *loader = NULL; - gnu::gcj::runtime::StackTrace *t - = new gnu::gcj::runtime::StackTrace(4); - java::lang::Class *klass = NULL; - try - { - for (int i = 2; !klass; i++) - { - klass = t->classAt (i); - } - loader = klass->getClassLoaderInternal(); - } - catch (::java::lang::ArrayIndexOutOfBoundsException *e) - { - // FIXME: RuntimeError - } - - return loader; + return obj; } java::lang::ClassLoader* |