Method.java (getExceptionTypes): Call getType() to initialize if exception_types...

	* java/lang/reflect/Method.java (getExceptionTypes): Call getType() to
	initialize if exception_types is null.
	* java/lang/reflect/Constructor.java: Likewise.
	* java/lang/reflect/natConstructor.cc (getType): Initialize
	exception_types to an empty Object array.

From-SVN: r40730

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 54c06b7af5fc4cf56d9b55662051a72477a54437..d74bd217a1cc33e67965b927bc15ff9ae4cfd354 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2001-03-22  Bryce McKinlay  <bryce@albatross.co.nz>
+
+       * java/lang/reflect/Method.java (getExceptionTypes): Call getType() to
+       initialize if exception_types is null.
+       * java/lang/reflect/Constructor.java: Likewise.
+       * java/lang/reflect/natConstructor.cc (getType): Initialize 
+       exception_types to an empty Object array.
+
 2001-03-21  Tom Tromey  <tromey@redhat.com>
 
        * configure: Rebuilt.

diff --git a/libjava/java/lang/reflect/Constructor.java b/libjava/java/lang/reflect/Constructor.java
index 77c437e24fa1105d9893b1bfb15bc870da50b9a4..2d527c3ba75de543d838fde9f09902db479b1b18 100644 (file)
--- a/libjava/java/lang/reflect/Constructor.java
+++ b/libjava/java/lang/reflect/Constructor.java
@@ -1,6 +1,6 @@
 // Constructor.java - Represents a constructor for a class.
 
-/* Copyright (C) 1998, 1999, 2000  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000, 2001  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -38,6 +38,8 @@ public final class Constructor extends AccessibleObject implements Member
 
   public Class[] getExceptionTypes ()
     {
+      if (exception_types == null)
+        getType();
       return (Class[]) exception_types.clone();
     }
 

diff --git a/libjava/java/lang/reflect/Method.java b/libjava/java/lang/reflect/Method.java
index 119a56f21412d4d75e7c6178168908b313d32e16..e616670e587b5a86e290638a4cecfbeaa1a9f460 100644 (file)
--- a/libjava/java/lang/reflect/Method.java
+++ b/libjava/java/lang/reflect/Method.java
@@ -1,6 +1,6 @@
 // Method.java - Represent method of class or interface.
 
-/* Copyright (C) 1998, 1999, 2000  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000, 2001  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -39,6 +39,8 @@ public final class Method extends AccessibleObject implements Member
 
   public Class[] getExceptionTypes ()
     {
+      if (exception_types == null)
+       getType();
       return (Class[]) exception_types.clone();
     }
 

diff --git a/libjava/java/lang/reflect/natConstructor.cc b/libjava/java/lang/reflect/natConstructor.cc
index a8da794bdb8844fafb4120083af2f05502667119..2209ad9fa6481ddafab14cc83f048c4094d0e336 100644 (file)
--- a/libjava/java/lang/reflect/natConstructor.cc
+++ b/libjava/java/lang/reflect/natConstructor.cc
@@ -34,6 +34,10 @@ java::lang::reflect::Constructor::getType ()
                             declaringClass,
                             &parameter_types,
                             NULL);
+
+  // FIXME: for now we have no way to get exception information.
+  exception_types = 
+    (JArray<jclass> *) JvNewObjectArray (0, &java::lang::Class::class$, NULL);
 }
 
 jobject