2003-01-14 Michael Koch <konqueror@gmx.de>

	* java/net/InetSocketAddress.java
	(serialVersionUID): New member variable.
	* java/net/NetPermission.java
	(NetPermission): Dont implement java.io.Serialization directly.
	* java/net/SocketAddress.java:
	(serialVersionUID): Documentation added.

From-SVN: r61305

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 49de829240febdf4227ad84d31413aaa609d8700..32b958904c65213b89fdb186e1ccb16e0a455e88 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2003-01-14  Michael Koch  <konqueror@gmx.de>
+
+       * java/net/InetSocketAddress.java
+       (serialVersionUID): New member variable.
+       * java/net/NetPermission.java
+       (NetPermission): Dont implement java.io.Serialization directly.
+       * java/net/SocketAddress.java:
+       (serialVersionUID): Documentation added.
+       
 2003-01-14  Michael Koch  <konqueror@gmx.de>
 
        * java/awt/Label.java

diff --git a/libjava/java/net/InetSocketAddress.java b/libjava/java/net/InetSocketAddress.java
index 1b740dcc50785c34fc1f8ae7fa7c7a69ea26d384..3c54b51a0f0b0446b1e150fb7d877a1f30fbd660 100644 (file)
--- a/libjava/java/net/InetSocketAddress.java
+++ b/libjava/java/net/InetSocketAddress.java
@@ -47,6 +47,11 @@ package java.net;
 
 public class InetSocketAddress extends SocketAddress
 {
+  /**
+   * Compatible with JDK 1.4+
+   */
+  private static final long serialVersionUID = 5076001401234631237L;
+  
   String hostname;
   InetAddress addr;
   int port;

diff --git a/libjava/java/net/NetPermission.java b/libjava/java/net/NetPermission.java
index f5b625a0d6f2df220b45d084f5ae34b0c4a97cfa..5b9502b7abe02c7adef52534a85a42612379031f 100644 (file)
--- a/libjava/java/net/NetPermission.java
+++ b/libjava/java/net/NetPermission.java
@@ -48,7 +48,6 @@ import java.security.BasicPermission;
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
 public final class NetPermission extends BasicPermission
-  implements java.io.Serializable
 {
   static final long serialVersionUID = -8343910153355041693L;
 

diff --git a/libjava/java/net/SocketAddress.java b/libjava/java/net/SocketAddress.java
index 370049d6fdcdbb0ffbd1b45f3dff815a36b3480f..f3e67d84cc0a298078aca0d4dbd55317ea945be7 100644 (file)
--- a/libjava/java/net/SocketAddress.java
+++ b/libjava/java/net/SocketAddress.java
@@ -48,6 +48,9 @@ import java.io.Serializable;
  */
 public abstract class SocketAddress implements Serializable
 {
+  /**
+   * Compatible with JDK 1.4+
+   */
   static final long serialVersionUID = 5215720748342549866L;
 
   /**