BasicPermission.java: Don't check wildcards.

2004-08-04  Andrew Haley  <aph@redhat.com>

        * java/security/BasicPermission.java: Don't check wildcards.

From-SVN: r85608

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1c250b5a7a4b185945f4354257bdd4dad49b669a..575c59188e9cfa65ee3017cc100b3130877253a2 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-04  Andrew Haley  <aph@redhat.com>
+
+       * java/security/BasicPermission.java: Don't check wildcards.
+
 2004-08-04  Thomas Fitzsimmons <fitzsim@redhat.com>
            Michael Koch  <konqueror@gmx.de>
 

diff --git a/libjava/java/security/BasicPermission.java b/libjava/java/security/BasicPermission.java
index 0945f2d7faf549f065a06c7693ca2bd80e6e3cf5..7b98563518ec876804f6a9d01ac0f18b01c5f378 100644 (file)
--- a/libjava/java/security/BasicPermission.java
+++ b/libjava/java/security/BasicPermission.java
@@ -80,9 +80,8 @@ public abstract class BasicPermission extends Permission
   private static final long serialVersionUID = 6279438298436773498L;
 
   /**
-   * Create a new instance with the specified permission name. If the name
-   * is empty, or contains an illegal wildcard character, an exception is
-   * thrown.
+   * Create a new instance with the specified permission name. If the
+   * name is empty an exception is thrown.
    *
    * @param name the name of this permission
    * @throws NullPointerException if name is null
@@ -91,12 +90,11 @@ public abstract class BasicPermission extends Permission
   public BasicPermission(String name)
   {
     super(name);
-    if (name.indexOf("*") != -1)
-      {
-        if ((! name.endsWith(".*") && ! name.equals("*"))
-            || name.indexOf("*") != name.lastIndexOf("*"))
-          throw new IllegalArgumentException("Bad wildcard: " + name);
-      }
+
+    // This routine used to check for illegal wildcards, but no such
+    // requirement exists in the specification and Sun's runtime
+    // doesn't appear to do it.
+
     if ("".equals(name))
       throw new IllegalArgumentException("Empty name");
   }