Patch: FYI: java.rmi mergelet

Tom Tromey tromey@redhat.com
Wed Oct 2 14:21:00 GMT 2002


I'm checking this in.  This is a trivial merge from Classpath.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>

	* java/rmi/activation/ActivationDesc.java,
	java/rmi/activation/ActivationGroupDesc.java,
	java/rmi/activation/ActivationGroupID.java,
	java/rmi/activation/ActivationID.java: New versions from
	Classpath.

Index: java/rmi/activation/ActivationDesc.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/rmi/activation/ActivationDesc.java,v
retrieving revision 1.2
diff -u -r1.2 ActivationDesc.java
--- java/rmi/activation/ActivationDesc.java 22 Jan 2002 22:40:25 -0000 1.2
+++ java/rmi/activation/ActivationDesc.java 2 Oct 2002 21:18:06 -0000
@@ -40,8 +40,9 @@
 import java.io.Serializable;
 import java.rmi.MarshalledObject;
 
-public final class ActivationDesc
-	implements Serializable {
+public final class ActivationDesc implements Serializable
+{
+  static final long serialVersionUID = 7455834104417690957L;
 
 private ActivationGroupID groupid;
 private String classname;
Index: java/rmi/activation/ActivationGroupDesc.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/rmi/activation/ActivationGroupDesc.java,v
retrieving revision 1.2
diff -u -r1.2 ActivationGroupDesc.java
--- java/rmi/activation/ActivationGroupDesc.java 22 Jan 2002 22:40:25 -0000 1.2
+++ java/rmi/activation/ActivationGroupDesc.java 2 Oct 2002 21:18:07 -0000
@@ -41,8 +41,9 @@
 import java.util.Properties;
 import java.rmi.MarshalledObject;
 
-public final class ActivationGroupDesc
-	implements Serializable {
+public final class ActivationGroupDesc implements Serializable
+{
+  static final long serialVersionUID = -4936225423168276595L;
 
 public static class CommandEnvironment
 	implements Serializable {
Index: java/rmi/activation/ActivationGroupID.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/rmi/activation/ActivationGroupID.java,v
retrieving revision 1.2
diff -u -r1.2 ActivationGroupID.java
--- java/rmi/activation/ActivationGroupID.java 22 Jan 2002 22:40:25 -0000 1.2
+++ java/rmi/activation/ActivationGroupID.java 2 Oct 2002 21:18:07 -0000
@@ -39,8 +39,9 @@
 
 import java.io.Serializable;
 
-public class ActivationGroupID
-	implements Serializable {
+public class ActivationGroupID implements Serializable
+{
+  static final long serialVersionUID = -1648432278909740833L;
 
 private ActivationSystem system;
 
Index: java/rmi/activation/ActivationID.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/rmi/activation/ActivationID.java,v
retrieving revision 1.2
diff -u -r1.2 ActivationID.java
--- java/rmi/activation/ActivationID.java 22 Jan 2002 22:40:25 -0000 1.2
+++ java/rmi/activation/ActivationID.java 2 Oct 2002 21:18:07 -0000
@@ -41,8 +41,9 @@
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 
-public class ActivationID
-	implements Serializable {
+public class ActivationID implements Serializable
+{
+  static final long serialVersionUID = -4608673054848209235L;
 
 private Activator activator;
 



More information about the Java-patches mailing list