[cp-patches] Path: java/lang/StackTraceElement.java

[Jeroen Frijters]

Hi,

I applied the following patch to make serialized stack traces (used in
RMI) compatible with Sun.

Regards,
Jeroen

2004-09-20  Jeroen Frijters  <address@hidden>

        * java/lang/StackTraceElement.java
        (className): Renamed field to declaringClass to be compatible
        with Sun serialization format.

Index: java/lang/StackTraceElement.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/java/lang/StackTraceElement.java,v
retrieving revision 1.2
diff -u -r1.2 StackTraceElement.java
--- java/lang/StackTraceElement.java    4 Oct 2002 15:26:25 -0000
1.2
+++ java/lang/StackTraceElement.java    20 Sep 2004 12:46:01 -0000
@@ -77,7 +77,7 @@
    *
    * @serial the enclosing class, if known
    */
-  private final String className;
+  private final String declaringClass;
 
   /**
    * The method name in the class, null if unknown.
@@ -106,7 +106,7 @@
   {
     this.fileName = fileName;
     this.lineNumber = lineNumber;
-    this.className = className;
+    this.declaringClass = className;
     this.methodName = methodName;
     this.isNative = isNative;
   }
@@ -142,7 +142,7 @@
    */
   public String getClassName()
   {
-    return className;
+    return declaringClass;
   }
 
   /**
@@ -183,9 +183,9 @@
   public String toString()
   {
     StringBuffer sb = new StringBuffer();
-    if (className != null)
+    if (declaringClass != null)
       {
-        sb.append(className);
+        sb.append(declaringClass);
         if (methodName != null)
           sb.append('.');
       }
@@ -217,7 +217,7 @@
     StackTraceElement e = (StackTraceElement) o;
     return equals(fileName, e.fileName)
       && lineNumber == e.lineNumber
-      && equals(className, e.className)
+      && equals(declaringClass, e.declaringClass)
       && equals(methodName, e.methodName);
   }
 
@@ -230,7 +230,7 @@
    */
   public int hashCode()
   {
-    return hashCode(fileName) ^ lineNumber ^ hashCode(className)
+    return hashCode(fileName) ^ lineNumber ^ hashCode(declaringClass)
       ^ hashCode(methodName);
   }