summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--java/net/SocketPermission.java13
2 files changed, 10 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 608e2394e..924bd6bdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-04 Tom Tromey <tromey@redhat.com>
+
+ * java/net/SocketPermission.java (hashCode): Rewrote.
+
2002-12-03 Michael Koch <konqueror@gmx.de>
* gnu/java/nio/SocketChannelImpl.java:
diff --git a/java/net/SocketPermission.java b/java/net/SocketPermission.java
index 0f41395f3..18fb7ef2f 100644
--- a/java/net/SocketPermission.java
+++ b/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;
}
/**