Index: ChangeLog =================================================================== RCS file: /cvsroot/classpath/classpath/ChangeLog,v retrieving revision 1.6073 diff -u -r1.6073 ChangeLog --- ChangeLog 16 Jan 2006 10:15:47 -0000 1.6073 +++ ChangeLog 16 Jan 2006 10:27:42 -0000 @@ -1,3 +1,7 @@ +2006-01-16 Gary Benson + + * java/net/SocketPermission.java (implies): Fix action checks. + 2006-01-16 Roman Kennke * native/target/generic/target_generic_math_float.h: Removed. This Index: java/net/SocketPermission.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/net/SocketPermission.java,v retrieving revision 1.16 diff -u -r1.16 SocketPermission.java --- java/net/SocketPermission.java 2 Jul 2005 20:32:39 -0000 1.16 +++ java/net/SocketPermission.java 16 Jan 2006 10:27:42 -0000 @@ -40,6 +40,7 @@ import java.io.Serializable; import java.security.Permission; import java.security.PermissionCollection; +import java.util.StringTokenizer; /** @@ -269,10 +270,11 @@ // Next check the actions String ourlist = getActions(); - String theirlist = p.getActions(); + StringTokenizer theirlist = new StringTokenizer(p.getActions(), ","); - if (! ourlist.startsWith(theirlist)) - return false; + while (theirlist.hasMoreTokens()) + if (ourlist.indexOf(theirlist.nextToken()) == -1) + return false; // Now check ports int ourfirstport = 0;