diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-12-05 02:16:29 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-12-05 02:16:29 +0000 |
| commit | a74bd357c30e7eb57df91b134b14928c9da3b885 (patch) | |
| tree | 593203804c136237f658155b75ef969f6e173618 | |
| parent | e6b681c4d357a872b9dfe53fd9f7714b806cc029 (diff) | |
| download | ppe42-gcc-a74bd357c30e7eb57df91b134b14928c9da3b885.tar.gz ppe42-gcc-a74bd357c30e7eb57df91b134b14928c9da3b885.zip | |
* java/net/SocketPermission.java (hashCode): Rewrote.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@59843 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 9 | ||||
| -rw-r--r-- | libjava/java/net/SocketPermission.java | 13 |
2 files changed, 7 insertions, 15 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4d7c7ff15f5..1235fc63005 100644 --- 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 0f41395f36a..18fb7ef2f1f 100644 --- 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; } /** |
