From 6d2cf1d88727dc149988a90f9692bfbc7b70bcd5 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 5 Dec 2002 02:16:29 +0000 Subject: [PATCH] * java/net/SocketPermission.java (hashCode): Rewrote. From-SVN: r59843 --- libjava/ChangeLog | 9 +-------- 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 - * 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 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; } /** -- 2.30.2