Based on patches submitted by Wu Gansha <gansha.wu@intel.com>

        * vm/reference/java/lang/reflect/Method.java (toString()): use
        Class.getName() not Class.toString().
        * vm/reference/java/lang/Class.java: final, implements Serializable.

2 files changed, 5 insertions, 4 deletions

diff --git a/vm/reference/java/lang/Class.java b/vm/reference/java/lang/Class.java
index 4e5440cdb..9ebf8c91c 100755
--- a/vm/reference/java/lang/Class.java
+++ b/vm/reference/java/lang/Class.java
@@ -1,5 +1,5 @@
 /* Class.java
-   Copyright (C) 1998 Free Software Foundation
+   Copyright (C) 1998, 2002 Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -37,6 +37,7 @@ exception statement from your version. */
 
 package java.lang;
 
+import java.io.Serializable;
 import java.lang.reflect.*;
 import java.security.*;
 import gnu.java.lang.*;
@@ -66,7 +67,7 @@ import gnu.java.lang.*;
  * @since JDK1.0
  */
 
-public class Class {
+public final class Class implements Serializable {
     private Object[] signers = null;
     private ProtectionDomain pd = null;
     
diff --git a/vm/reference/java/lang/reflect/Method.java b/vm/reference/java/lang/reflect/Method.java
index 5cc8801ac..454628b2b 100644
--- a/vm/reference/java/lang/reflect/Method.java
+++ b/vm/reference/java/lang/reflect/Method.java
@@ -1,5 +1,5 @@
 /* java.lang.reflect.Method - reflection of Java methods
-   Copyright (C) 1998, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -180,7 +180,7 @@ extends AccessibleObject implements Member
   {
     StringBuffer sb = new StringBuffer();
     Modifier.toString(getModifiers(), sb).append(' ');
-    sb.append(getReturnType()).append(' ');
+    sb.append(getReturnType().getName()).append(' ');
     sb.append(getDeclaringClass().getName()).append('.');
     sb.append(getName()).append('(');
     Class[] c = getParameterTypes();