* java/net/SocketPermission.java (hashCode): Rewrote.

From-SVN: r59843

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4d7c7ff..1235fc6 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,13 +1,6 @@
 2002-12-04  Tom Tromey  <tromey@redhat.com>
 
-       * Makefile.in: Rebuilt.
-       * Makefile.am (nat_source_files): Added natVMSecurityManager,
-       natResourceBundle.
-       * java/util/ResourceBundle.java (Security): Removed.
-       (getCallingClassLoader): Now native.
-       * java/util/natResourceBundle.cc: New file.
-       * java/lang/natVMSecurityManager.cc: New file.
-       * java/lang/VMSecurityManager.java (getClassContext): Now native.
+       * java/net/SocketPermission.java (hashCode): Rewrote.
 
 2002-12-03  Mark Wielaard  <mark@klomp.org>
 

diff --git a/libjava/java/net/SocketPermission.java b/libjava/java/net/SocketPermission.java
index 0f41395..18fb7ef 100644 (file)
--- a/libjava/java/net/SocketPermission.java
+++ b/libjava/java/net/SocketPermission.java
@@ -1,5 +1,5 @@
 /* SocketPermission.java -- Class modeling permissions for socket operations
-   Copyright (C) 1998, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -166,12 +166,11 @@ public final class SocketPermission extends Permission
   public int hashCode()
   {
     int hash = 100;
-
-    // FIXME: Get a real hash function
-    for (int i = 0; i < hostport.length(); i++)
-      hash = hash + (int) hostport.charAt(i) * 7;
-
-    return (hash);
+    if (hostport != null)
+      hash += hostport.hashCode();
+    if (actions != null)
+      hash += actions.hashCode();
+    return hash;
   }
 
   /**