2006-01-16 Gary Benson <gbenson@redhat.com>

	* java/net/SocketPermission.java (implies): Fix action checks.

2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 84157e6e0..c97bbea3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-16  Gary Benson  <gbenson@redhat.com>
+
+	* java/net/SocketPermission.java (implies): Fix action checks.
+
 2006-01-16  Roman Kennke  <kennke@aicas.com>
 
 	* native/target/generic/target_generic_math_float.h: Removed. This
diff --git a/java/net/SocketPermission.java b/java/net/SocketPermission.java
index 8ccd01bae..c35aa9639 100644
--- a/java/net/SocketPermission.java
+++ b/java/net/SocketPermission.java
@@ -40,6 +40,7 @@ package java.net;
 import java.io.Serializable;
 import java.security.Permission;
 import java.security.PermissionCollection;
+import java.util.StringTokenizer;
 
 
 /**
@@ -269,10 +270,11 @@ public final class SocketPermission extends Permission implements Serializable
 
     // 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;