harmony-commits mailing list archives

Author: pyang
Date: Thu Sep 28 20:46:44 2006
New Revision: 451107

URL: http://svn.apache.org/viewvc?view=rev&rev=451107
Log:
Apply patch for HARMONY-1579([classlib][luni]SUID of Enum is different from RI)

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectStreamClass.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Enum.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectStreamClass.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectStreamClass.java?view=diff&rev=451107&r1=451106&r2=451107
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectStreamClass.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectStreamClass.java
Thu Sep 28 20:46:44 2006
@@ -207,7 +207,7 @@
         if (computeSUID) {
             // Lazy computation, to save speed & space
             declaredFields = cl.getDeclaredFields();
-            result.setSerialVersionUID(cl.isEnum() ? 0
+            result.setSerialVersionUID((cl.isEnum() || (cl == Enum.class)) ? 0
                     : computeSerialVersionUID(cl, declaredFields));
         }
 
@@ -238,8 +238,8 @@
 
 		return result;
 	}
-
-	/**
+    
+    /**
 	 * Builds the collection of field descriptors for the receiver
 	 * 
 	 * @param declaredFields

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Enum.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Enum.java?view=diff&rev=451107&r1=451106&r2=451107
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Enum.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Enum.java
Thu Sep 28 20:46:44 2006
@@ -29,7 +29,7 @@
 public abstract class Enum<E extends Enum<E>> implements Serializable,
         Comparable<E> {
 
-    private static final long serialVersionUID = 0L;
+    private static final long serialVersionUID = -4300926546619394005L;
 
     private final String name;